From: Christian Dywan <christian@twotoasts.de>
Date: Thu, 11 Jun 2009 21:57:42 +0000 (+0200)
Subject: Adjust mnemonics to not conflict when used in the same context
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=491b89bcb3930403ee557f09497e64fa9954f533;p=midori

Adjust mnemonics to not conflict when used in the same context
---

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8263c06a..46a5c2eb 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4037,7 +4037,7 @@ static const GtkActionEntry entries[] = {
     N_("Custom..."), "",
     NULL, G_CALLBACK (_action_view_encoding_activate) },
  { "SourceView", NULL,
-   N_("View _Source"), "<Ctrl>U",
+   N_("View So_urce"), "<Ctrl>U",
    N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) },
  { "SelectionSourceView", NULL,
     N_("View Selection Source"), "",
@@ -4061,14 +4061,14 @@ static const GtkActionEntry entries[] = {
    N_("Empty Trash"), "",
    N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) },
  { "UndoTabClose", GTK_STOCK_UNDELETE,
-   N_("Undo Close Tab"), "<Ctrl><Shift>t",
+   N_("Undo _Close Tab"), "<Ctrl><Shift>t",
    N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
 
  { "BookmarkAdd", STOCK_BOOKMARK_ADD,
    NULL, "<Ctrl>d",
    N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
  { "BookmarkFolderAdd", GTK_STOCK_DIRECTORY,
-   N_("Add a new folder"), "",
+   N_("Add a new _folder"), "",
    N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) },
  { "Tools", NULL, N_("_Tools") },
  { "ManageSearchEngines", GTK_STOCK_PROPERTIES,
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 054a9e4d..93af3d47 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1314,7 +1314,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
             }
         }
         g_list_free (items);
-        menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab"));
+        menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo _Close Tab"));
         icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU);
         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon);
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
@@ -1356,7 +1356,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
         if (!midori_view_can_view_source (view))
             gtk_widget_set_sensitive (menuitem, FALSE);
 
-        menuitem = gtk_image_menu_item_new_with_mnemonic (_("View _Source"));
+        menuitem = gtk_image_menu_item_new_with_mnemonic (_("View So_urce"));
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
         g_object_set_data (G_OBJECT (menuitem), "action", "SourceView");
         g_signal_connect (menuitem, "activate",
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 7ecda869..e9db1195 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -854,7 +854,7 @@ sokoke_register_stock_items (void)
 
         { STOCK_BOOKMARK,       N_("_Bookmark"), 0, 0, GTK_STOCK_FILE },
         { STOCK_BOOKMARKS,      N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY },
-        { STOCK_BOOKMARK_ADD,   N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD },
+        { STOCK_BOOKMARK_ADD,   N_("Add Boo_kmark"), 0, 0, GTK_STOCK_ADD },
         { STOCK_CONSOLE,        N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING },
         { STOCK_EXTENSIONS,     N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT },
         { STOCK_HISTORY,        N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING },