Add context to ambiguous strings. Fixes bug #113932.

2004-12-25  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-encodings.c: (ephy_encodings_init):
	* lib/ephy-langs.c:
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):
	* src/ephy-window.c: (show_embed_popup), (tab_context_menu_cb),
	(ephy_window_set_active_tab):
	* src/prefs-dialog.c: (create_fonts_language_menu):

	Add context to ambiguous strings. Fixes bug #113932.

5 files changed, 48 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index e47c729c6..0ed2a09da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-25  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/ephy-encodings.c: (ephy_encodings_init):
+	* lib/ephy-langs.c:
+	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):
+	* src/ephy-window.c: (show_embed_popup), (tab_context_menu_cb),
+	(ephy_window_set_active_tab):
+	* src/prefs-dialog.c: (create_fonts_language_menu):
+
+	Add context to ambiguous strings. Fixes bug #113932.
+
 2004-12-24  Christian Persch  <chpe@cvs.gnome.org>
 
 	* lib/ephy-marshal.list:
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index ce8d87e90..922c31a49 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -140,16 +140,16 @@ encoding_entries [] =
 	{ N_("Unicode (UTF-_32 BE)"),               "UTF-32BE",              0,			FALSE },
 	{ N_("Unicode (UTF-3_2 LE)"),               "UTF-32LE",              0,			FALSE },
 
-	{ N_("Off"),		 		    "",				   LG_NONE,								TRUE },
-	{ N_("Chinese"),			    "zh_parallel_state_machine",   LG_CHINESE_TRAD | LG_CHINESE_SIMP,					TRUE },
-	{ N_("Chinese Simplified"),		    "zhcn_parallel_state_machine", LG_CHINESE_SIMP,							TRUE },
-	{ N_("Chinese Traditional"),		    "zhtw_parallel_state_machine", LG_CHINESE_TRAD,							TRUE },
-	{ N_("East Asian"),			    "cjk_parallel_state_machine",  LG_CHINESE_TRAD | LG_CHINESE_SIMP | LG_JAPANESE | LG_KOREAN,		TRUE },
-	{ N_("Japanese"),			    "ja_parallel_state_machine",   LG_JAPANESE,								TRUE },
-	{ N_("Korean"),				    "ko_parallel_state_machine",   LG_KOREAN,								TRUE },
-	{ N_("Russian"),			    "ruprob",			   LG_CYRILLIC | LG_UKRAINIAN,						TRUE },
-	{ N_("Universal"),	   		    "universal_charset_detector",  LG_ALL,								TRUE },
-	{ N_("Ukrainian"),	   		    "ukprob",			   LG_UKRAINIAN,							TRUE }
+	{ N_("autodetectors|Off"),						    "",				   LG_NONE,								TRUE },
+	{ N_("automatically detect ... character encodings|Chinese"),		    "zh_parallel_state_machine",   LG_CHINESE_TRAD | LG_CHINESE_SIMP,					TRUE },
+	{ N_("automatically detect ... character encodings|Simplified Chinese"),    "zhcn_parallel_state_machine", LG_CHINESE_SIMP,							TRUE },
+	{ N_("automatically detect ... character encodings|Traditional Chinese"),   "zhtw_parallel_state_machine", LG_CHINESE_TRAD,							TRUE },
+	{ N_("automatically detect ... character encodings|East Asian"),	    "cjk_parallel_state_machine",  LG_CHINESE_TRAD | LG_CHINESE_SIMP | LG_JAPANESE | LG_KOREAN,		TRUE },
+	{ N_("automatically detect ... character encodings|Japanese"),		    "ja_parallel_state_machine",   LG_JAPANESE,								TRUE },
+	{ N_("automatically detect ... character encodings|Korean"),		    "ko_parallel_state_machine",   LG_KOREAN,								TRUE },
+	{ N_("automatically detect ... character encodings|Russian"),		    "ruprob",			   LG_CYRILLIC | LG_UKRAINIAN,						TRUE },
+	{ N_("automatically detect ... character encodings|Universal"),	   	    "universal_charset_detector",  LG_ALL,								TRUE },
+	{ N_("automatically detect ... character encodings|Ukrainian"),	   	    "ukprob",			   LG_UKRAINIAN,							TRUE }
 };
 static const guint n_encoding_entries = G_N_ELEMENTS (encoding_entries);
 
@@ -478,7 +478,9 @@ ephy_encodings_init (EphyEncodings *encodings)
 	for (i = 0; i < n_encoding_entries; i++)
 	{
 		add_encoding (encodings,
-			      _(encoding_entries[i].title),
+			      encoding_entries[i].is_autodetector
+			      	? Q_(encoding_entries[i].title)
+			 	: _(encoding_entries[i].title),
 			      encoding_entries[i].code,
 			      encoding_entries[i].groups,
 			      encoding_entries[i].is_autodetector);
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 1dc15dd3e..e7fcf6c38 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -34,23 +34,23 @@
 
 static const EphyFontsLanguageInfo font_languages [] =
 {
-	{ N_("Arabic"),					"ar" },
-	{ N_("Baltic"),					"x-baltic" },
-	{ N_("Central European"),			"x-central-euro" },
-	{ N_("Cyrillic"),				"x-cyrillic" },
-	{ N_("Devanagari"),				"x-devanagari" },
-	{ N_("Greek"),					"el" },
-	{ N_("Hebrew"),					"he" },
-	{ N_("Japanese"),				"ja" },
-	{ N_("Korean"),					"ko" },
-	{ N_("Simplified Chinese"),			"zh-CN" },
-	{ N_("Tamil"),					"x-tamil" },
-	{ N_("Thai"),					"th" },
-	{ N_("Traditional Chinese"),			"zh-TW" },
-	{ N_("Traditional Chinese (Hong Kong)"),	"zh-HK" },
-	{ N_("Turkish"),				"tr" },
-	{ N_("Unicode"),				"x-unicode" },
-	{ N_("Western"),				"x-western" }
+	{ N_("select fonts for|Arabic"),				"ar" },
+	{ N_("select fonts for|Baltic"),				"x-baltic" },
+	{ N_("select fonts for|Central European"),			"x-central-euro" },
+	{ N_("select fonts for|Cyrillic"),				"x-cyrillic" },
+	{ N_("select fonts for|Devanagari"),				"x-devanagari" },
+	{ N_("select fonts for|Greek"),					"el" },
+	{ N_("select fonts for|Hebrew"),				"he" },
+	{ N_("select fonts for|Japanese"),				"ja" },
+	{ N_("select fonts for|Korean"),				"ko" },
+	{ N_("select fonts for|Simplified Chinese"),			"zh-CN" },
+	{ N_("select fonts for|Tamil"),					"x-tamil" },
+	{ N_("select fonts for|Thai"),					"th" },
+	{ N_("select fonts for|Traditional Chinese"),			"zh-TW" },
+	{ N_("select fonts for|Traditional Chinese (Hong Kong)"),	"zh-HK" },
+	{ N_("select fonts for|Turkish"),				"tr" },
+	{ N_("select fonts for|Unicode"),				"x-unicode" },
+	{ N_("select fonts for|Western"),				"x-western" }
 };
 static const guint n_font_languages = G_N_ELEMENTS (font_languages);
 
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index f8e9fe428..62618a6be 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -782,7 +782,8 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 	/* Bookmarks */
 	eb->priv->bookmarks = ephy_node_new_with_id (db, BOOKMARKS_NODE_ID);
 	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_string (&value, _("All"));
+	/* translators: this topic contains all bookmarks */
+	g_value_set_string (&value, Q_("bookmarks|All"));
 	ephy_node_set_property (eb->priv->bookmarks,
 			        EPHY_NODE_KEYWORD_PROP_NAME,
 			        &value);
@@ -815,7 +816,8 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 	/* Favorites */
 	eb->priv->favorites = ephy_node_new_with_id (db, FAVORITES_NODE_ID);
 	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_string (&value, _("Most Visited"));
+	/* translators: this topic contains the most used bookmarks */
+	g_value_set_string (&value, Q_("bookmarks|Most Visited"));
 	ephy_node_set_property (eb->priv->favorites,
 			        EPHY_NODE_KEYWORD_PROP_NAME,
 			        &value);
@@ -831,7 +833,8 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 	/* Not categorized */
 	eb->priv->notcategorized = ephy_node_new_with_id (db, BMKS_NOTCATEGORIZED_NODE_ID);
 	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_string (&value, _("Not Categorized"));
+	/* translators: this topic contains the not categorized bookmarks */
+	g_value_set_string (&value, Q_("bookmarks|Not Categorized"));
 	ephy_node_set_property (eb->priv->notcategorized,
 			        EPHY_NODE_KEYWORD_PROP_NAME,
 			        &value);
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 48bc77311..efb559220 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -739,7 +739,7 @@ create_fonts_language_menu (EphyDialog *dialog)
 	{
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter,
-				    COL_FONTS_LANG_NAME, _(fonts_languages[i].title),
+				    COL_FONTS_LANG_NAME, Q_(fonts_languages[i].title),
 				    COL_FONTS_LANG_CODE, fonts_languages[i].code,
 				    -1);
 	}