From 03f9db5121049f550990f5233b0032693cac72af Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Tue, 9 Aug 2022 17:54:10 -0300
Subject: [PATCH] Move export/import commands to submenus inside File >
 Export/Import

---
 data/gui.xml        | 15 ++++++++++-----
 data/strings/en.ini |  8 +++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/data/gui.xml b/data/gui.xml
index 4e01f20e6..254c9b31c 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -669,14 +669,19 @@
 	</menu>
         <separator />
         <item command="SaveFile" text="@.file_save" />
-        <item command="SaveFileAs" text="@.file_save_as" />
-        <item command="SaveFileCopyAs" text="@.file_export" group="file_save" />
+        <item command="SaveFileAs" text="@.file_save_as" group="file_save" />
         <item command="CloseFile" text="@.file_close" />
         <item command="CloseAllFiles" text="@.file_close_all" group="file_close" />
         <separator />
-        <item command="ImportSpriteSheet" text="@.file_import_sprite_sheet" group="file_import" />
-        <item command="ExportSpriteSheet" text="@.file_export_sprite_sheet" group="file_export" />
-        <item command="RepeatLastExport" text="@.file_repeat_last_export" />
+        <menu text="@.file_export" group="file_export">
+          <item command="SaveFileCopyAs" text="@.file_export_as" />
+          <item command="ExportSpriteSheet" text="@.file_export_sprite_sheet" group="file_export_sub" />
+          <separator />
+          <item command="RepeatLastExport" text="@.file_repeat_last_export" />
+        </menu>
+        <menu text="@.file_import" group="file_import">
+          <item command="ImportSpriteSheet" text="@.file_import_sprite_sheet" group="file_import_sub" />
+        </menu>
         <separator id="scripts_menu_separator" />
         <menu id="scripts_menu" text="@.file_scripts" group="file_scripts">
           <item command="OpenScriptFolder" text="@.file_open_script_folder" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index e59cdc7a2..348ff6793 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -885,12 +885,14 @@ file_no_recent_file = No Recent File
 file_clear_recent_files = &Clear Recent Files
 file_save = &Save
 file_save_as = Save &As...
-file_export = Expor&t...
 file_close = &Close
 file_close_all = Close All
-file_import_sprite_sheet = &Import Sprite Sheet
-file_export_sprite_sheet = &Export Sprite Sheet
+file_export = &Export
+file_export_as = &Export As...
+file_export_sprite_sheet = Export &Sprite Sheet
 file_repeat_last_export = Repeat &Last Export
+file_import = &Import
+file_import_sprite_sheet = &Import Sprite Sheet
 file_scripts = Scri&pts
 file_open_script_folder = &Open Scripts Folder
 file_rescan_script_folder = &Rescan Scripts Folder