[kde-doc-english] [ark] /: Rename the Action menu as File menu

[Elvis Angelaccio]

Git commit ea1528c1a526f94e3fc1720d08c05d0c96826137 by Elvis Angelaccio.
Committed on 09/02/2016 at 10:37.
Pushed by elvisangelaccio into branch 'master'.

Rename the Action menu as File menu

This renames the 'Action' menu as 'File' menu, since the actions in there mostly apply
to files within the archive. Now there is a clear distinction between
actions that only apply to the archive (in the 'Archive' menu) and actions that
apply to the files in the archive.

Differential Revision: D790

GUI:

M  +3    -1    app/arkui.rc
M  +6    -6    part/ark_part.rc
M  +2    -2    part/part.cpp

http://commits.kde.org/ark/ea1528c1a526f94e3fc1720d08c05d0c96826137

diff --git a/app/arkui.rc b/app/arkui.rc
index ea842d5..4949c36 100644
--- a/app/arkui.rc
+++ b/app/arkui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark" version="13">
+<kpartgui name="ark" version="14">
 <MenuBar>
 	<Menu name="archive">
 		<text>&Archive</text>
@@ -9,6 +9,8 @@
 		<Separator/>
 		<DefineGroup name="file_save" append="save_merge"/>
 		<Separator/>
+		<DefineGroup name="archive_edit" append="save_merge"/>
+		<Separator/>
 		<Action name="ark_quit"/>
 	</Menu>
 	<Merge/>
diff --git a/part/ark_part.rc b/part/ark_part.rc
index 8698f6a..af29944 100644
--- a/part/ark_part.rc
+++ b/part/ark_part.rc
@@ -1,19 +1,19 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_part" version="4">
+<kpartgui name="ark_part" version="5">
 <MenuBar>
 	<Menu name="archive">
 		<text>&Archive</text>
 		<Action name="ark_file_save_as" group="file_save"/>
+		<Action name="add" group="archive_edit"/>
+		<Action name="add-dir" group="archive_edit"/>
+		<Action name="delete" group="archive_edit"/>
 	</Menu>
-	<Menu name="action">
-		<text>&Action</text>
+	<Menu name="ark_file">
+		<text>&File</text>
 		<Action name="preview"/>
 		<Action name="openfile"/>
 		<Action name="openfilewith"/>
 		<Separator/>
-		<Action name="add"/>
-		<Action name="add-dir"/>
-		<Action name="delete"/>
 		<Action name="extract"/>
 	</Menu>
 	<Menu name="settings">
diff --git a/part/part.cpp b/part/part.cpp
index 7f4174d..5514852 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -289,14 +289,14 @@ void Part::setupActions()
     actionCollection()->addAction(KStandardAction::SaveAs, QStringLiteral("ark_file_save_as"), this, SLOT(slotSaveAs()));
 
     m_openFileAction = actionCollection()->addAction(QStringLiteral("openfile"));
-    m_openFileAction->setText(i18nc("open a file with external program", "&Open File"));
+    m_openFileAction->setText(i18nc("open a file with external program", "&Open"));
     m_openFileAction->setIcon(QIcon::fromTheme(QStringLiteral("document-open")));
     m_openFileAction->setStatusTip(i18n("Click to open the selected file with the associated application"));
     connect(m_openFileAction, SIGNAL(triggered(bool)), m_signalMapper, SLOT(map()));
     m_signalMapper->setMapping(m_openFileAction, OpenFile);
 
     m_openFileWithAction = actionCollection()->addAction(QStringLiteral("openfilewith"));
-    m_openFileWithAction->setText(i18nc("open a file with external program", "Open File &With..."));
+    m_openFileWithAction->setText(i18nc("open a file with external program", "Open &With..."));
     m_openFileWithAction->setIcon(QIcon::fromTheme(QStringLiteral("document-open")));
     m_openFileWithAction->setStatusTip(i18n("Click to open the selected file with an external program"));
     connect(m_openFileWithAction, SIGNAL(triggered(bool)), m_signalMapper, SLOT(map()));