From: Vladimir Nadvornik <nadvornik@suse.cz>
Date: Sun, 12 Apr 2009 08:36:53 +0000 (+0000)
Subject: fixed ambiguous strings
X-Git-Tag: v1.0.0~260
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=6fc844092598a09b07c51f3ca9434d84dc1f7723

fixed ambiguous strings
---

diff --git a/src/bar.c b/src/bar.c
index 90272768..85eec6d9 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -153,7 +153,7 @@ static const KnownPanes known_panes[] = {
 	{PANE_EXIF,		"exif",		N_("Exif"),		default_config_exif},
 /* other pre-configured panes */
 	{PANE_EXIF,		"file_info",	N_("File info"),	default_config_file_info},
-	{PANE_EXIF,		"location",	N_("Location"),		default_config_location},
+	{PANE_EXIF,		"location",	N_("Location and GPS"),	default_config_location},
 	{PANE_EXIF,		"copyright",	N_("Copyright"),	default_config_copyright},
 
 	{PANE_UNDEF,		NULL,		NULL,			NULL}
@@ -277,7 +277,7 @@ static void bar_menu_popup(GtkWidget *widget)
 		menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(bar_expander_move_down_cb), expander);
 		menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander);
 		menu_item_add_divider(menu);
-		menu_item_add_stock(menu, pgettext("virtual","Delete"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander);
+		menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander);
 		menu_item_add_divider(menu);
 		}
 
diff --git a/src/bar_exif.c b/src/bar_exif.c
index 6d213407..143888a9 100644
--- a/src/bar_exif.c
+++ b/src/bar_exif.c
@@ -605,7 +605,7 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped)
 		{
 		/* for the entry */
 		gchar *conf = g_strdup_printf(_("Configure \"%s\""), ee->title);
-		gchar *del = g_strdup_printf(_("Delete \"%s\""), ee->title);
+		gchar *del = g_strdup_printf(_("Remove \"%s\""), ee->title);
 		
 		menu_item_add_stock(menu, conf, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_exif_conf_dialog_cb), widget);
 		menu_item_add_stock(menu, del, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_exif_delete_entry_cb), widget);
diff --git a/src/bar_keywords.c b/src/bar_keywords.c
index f3636032..c71ba216 100644
--- a/src/bar_keywords.c
+++ b/src/bar_keywords.c
@@ -1132,7 +1132,7 @@ static void bar_pane_keywords_menu_popup(GtkWidget *widget, PaneKeywordsData *pk
 		text = g_strdup_printf(_("Edit \"%s\""), name);
 		menu_item_add_stock(menu, text, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_keywords_edit_dialog_cb), pkd);
 		g_free(text);
-		text = g_strdup_printf(_("Delete \"%s\""), name);
+		text = g_strdup_printf(_("Remove \"%s\""), name);
 		menu_item_add_stock(menu, text, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_keywords_delete_cb), pkd);
 		g_free(text);