Use distinct labels for Refresh actions in shortcut editor

diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index 12671fa36633c39937726959d1e9ec9fca0aa6cc..a9cd16577d95f5c26bec9232f5efc26a8aa77bdd 100644 (file)
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -100,10 +100,16 @@ shortcuts_accel_cleared_cb (GtkCellRenderer* renderer,
 static gchar*
 shortcuts_label_for_action (GtkAction* action)
 {
+    const gchar* name = gtk_action_get_name (action);
     gchar* label;
     gchar* stripped;
 
-    if ((label = katze_object_get_string (action, "label")))
+    if (g_str_equal (name, "ReloadStop"))
+    {
+        label = NULL;
+        stripped = g_strdup (_("Reload page or stop loading"));
+    }
+    else if ((label = katze_object_get_string (action, "label")))
         stripped = katze_strip_mnemonics (label);
     else
     {

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0974f9c9f2fe0080564045489a4ef0209350409c..d75faa075954449f44cd78f0afbc884eae5ba544 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4892,7 +4892,7 @@ static const GtkActionEntry entries[] =
         NULL, "<Ctrl>r",
         N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
     { "ReloadUncached", GTK_STOCK_REFRESH,
-        NULL, "<Ctrl><Shift>r",
+        N_("Reload page without caching"), "<Ctrl><Shift>r",
         N_("Reload page without caching"), G_CALLBACK (_action_reload_stop_activate) },
     { "Stop", GTK_STOCK_STOP,
         NULL, "Escape",