From f01603aa09a8c49d9835a10ad837ef0c286b9a7e Mon Sep 17 00:00:00 2001
From: John Smith <john.smith7545@yahoo.com>
Date: Fri, 11 May 2012 21:56:30 +0900
Subject: Fix for 169759 : HIG compliant Edit menu

(bzr r11354)
---
 src/menus-skeleton.h    | 2 +-
 src/verbs.cpp           | 2 +-
 src/widgets/toolbox.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 84ecc83ea..44d448fd1 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -36,7 +36,6 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"DialogDocumentProperties\" />\n"
 "       <verb verb-id=\"DialogMetadata\" />\n"
-"       <verb verb-id=\"DialogPreferences\" />\n"
 "       <verb verb-id=\"DialogInput\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"FileClose\" />\n"
@@ -91,6 +90,7 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"EditRemoveAllGuides\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"DialogXMLEditor\" />\n"
+"       <verb verb-id=\"DialogPreferences\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_View") "\">\n"
 "     <submenu name=\"" N_("_Zoom") "\">\n"
diff --git a/src/verbs.cpp b/src/verbs.cpp
index c30146ae8..2c1d178cb 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2633,7 +2633,7 @@ Verb *Verb::_base_verbs[] = {
                  N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")),
 
     // Dialogs
-    new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("In_kscape Preferences..."),
+    new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("P_references..."),
                    N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ),
     new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."),
                    N_("Edit properties of this document (to be saved with the document)"), GTK_STOCK_PROPERTIES ),
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 50e4b1504..78d0683f3 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1499,8 +1499,8 @@ void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
         "    <toolitem action='DialogXMLEditor' />"
         "    <toolitem action='DialogAlignDistribute' />"
         "    <separator />"
-        "    <toolitem action='DialogPreferences' />"
         "    <toolitem action='DialogDocumentProperties' />"
+        "    <toolitem action='DialogPreferences' />"
         "  </toolbar>"
         "</ui>";
 
-- 
cgit v1.2.3