seahorse r2824 - in trunk: . src

[kelemeng svn gnome org]

Author: kelemeng
Date: Tue Feb 17 13:59:09 2009
New Revision: 2824
URL: http://svn.gnome.org/viewvc/seahorse?rev=2824&view=rev

Log:
2009-02-17  Gabor Kelemen  <kelemeng gnome hu>

	* src/seahorse-keyserver-results.c:
	* src/seahorse-key-manager.c:
	* src/seahorse-viewer.c: Get rid of some reused stock item names, 
	fall back to default. Fixes bug #572140.

Modified:
   trunk/ChangeLog
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-keyserver-results.c
   trunk/src/seahorse-viewer.c

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Tue Feb 17 13:59:09 2009
@@ -745,13 +745,13 @@
 
 static const GtkActionEntry GENERAL_ENTRIES[] = {
 	{ "remote-menu", NULL, N_("_Remote") }, 
-	{ "app-quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", 
+	{ "app-quit", GTK_STOCK_QUIT, NULL, "<control>Q", 
 	  N_("Close this program"), G_CALLBACK (on_app_quit) }, 
 	{ "file-new", GTK_STOCK_NEW, N_("_New..."), "<control>N", 
 	  N_("Create a new key or item"), G_CALLBACK (on_file_new) }, 
 	{ "file-import", GTK_STOCK_OPEN, N_("_Import..."), "<control>I", 
 	  N_("Import from a file"), G_CALLBACK (on_key_import_file) }, 
-	{ "edit-import-clipboard", GTK_STOCK_PASTE, N_("_Paste"), "<control>V", 
+	{ "edit-import-clipboard", GTK_STOCK_PASTE, NULL, "<control>V", 
 	  N_("Import from the clipboard"), G_CALLBACK (on_key_import_clipboard) }
 };
 

Modified: trunk/src/seahorse-keyserver-results.c
==============================================================================
--- trunk/src/seahorse-keyserver-results.c	(original)
+++ trunk/src/seahorse-keyserver-results.c	Tue Feb 17 13:59:09 2009
@@ -219,7 +219,7 @@
 
 static const GtkActionEntry GENERAL_ENTRIES[] = {
 	{ "remote-menu", NULL, N_("_Remote") }, 
-	{ "app-close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 
+	{ "app-close", GTK_STOCK_CLOSE, NULL, "<control>W", 
 	  N_("Close this window"), G_CALLBACK (on_app_close) }, 
 	{ "view-expand-all", GTK_STOCK_ADD, N_("_Expand All"), NULL, 
 	  N_("Expand all listings"), G_CALLBACK (on_view_expand_all) }, 

Modified: trunk/src/seahorse-viewer.c
==============================================================================
--- trunk/src/seahorse-viewer.c	(original)
+++ trunk/src/seahorse-viewer.c	Tue Feb 17 13:59:09 2009
@@ -196,7 +196,7 @@
 	{ "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
 	  N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) },
 #endif
-	{ "app-about", "gtk-about", N_("_About"), NULL, 
+	{ "app-about", GTK_STOCK_ABOUT, NULL, NULL, 
 	  N_("About this program"), G_CALLBACK (on_app_about) }, 
 	{ "help-show", GTK_STOCK_HELP, N_("_Contents"), "F1",
 	  N_("Show Seahorse help"), G_CALLBACK (on_help_show) } 
@@ -492,7 +492,7 @@
 }
 		
 static const GtkActionEntry KEY_ENTRIES[] = {
-	{ "show-properties", GTK_STOCK_PROPERTIES, N_("P_roperties"), NULL,
+	{ "show-properties", GTK_STOCK_PROPERTIES, NULL, NULL,
 	  N_("Show properties"), G_CALLBACK (on_key_properties) },
 	{ "edit-delete", GTK_STOCK_DELETE, NC_("This text refers to deleting an item from its type's backing store.", "_Delete"), NULL,
 	  N_("Delete selected items"), G_CALLBACK (on_key_delete) }
@@ -501,7 +501,7 @@
 static const GtkActionEntry EXPORT_ENTRIES[] = {
 	{ "file-export", GTK_STOCK_SAVE_AS, N_("E_xport..."), NULL,
 	  N_("Export to a file"), G_CALLBACK (on_key_export_file) },
-	{ "edit-export-clipboard", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+	{ "edit-export-clipboard", GTK_STOCK_COPY, NULL, "<control>C",
 	  N_("Copy to the clipboard"), G_CALLBACK (on_key_export_clipboard) }
 };