gtkhtml r8943 - in trunk: . components/editor

[msuman svn gnome org]

Author: msuman
Date: Mon Sep  1 04:12:47 2008
New Revision: 8943
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8943&view=rev

Log:
Patch from Leonardo Ferreira Fontenelle  <leonardof gnome org>: Fix for bug #549235 (Fix translator comments, use the C_() macro instead of Q_()).

Modified:
   trunk/ChangeLog
   trunk/components/editor/ChangeLog
   trunk/components/editor/gtkhtml-spell-language.c
   trunk/configure.in

Modified: trunk/components/editor/gtkhtml-spell-language.c
==============================================================================
--- trunk/components/editor/gtkhtml-spell-language.c	(original)
+++ trunk/components/editor/gtkhtml-spell-language.c	Mon Sep  1 04:12:47 2008
@@ -175,11 +175,9 @@
 	iso_639_name = g_hash_table_lookup (iso_639_table, tokens[0]);
 
 	if (iso_639_name == NULL) {
-		/* Translators: The text before the "|" is context to help
-		 * you decide on the correct translation. You MUST OMIT IT
-		 * in the translated string. */
 		language_name = g_strdup_printf (
-			Q_("language|Unknown (%s)"), language_code);
+		/* Translators: %s is the language ISO code. */
+			C_("language", "Unknown (%s)"), language_code);
 		goto exit;
 	}
 
@@ -191,21 +189,15 @@
 	iso_3166_name = g_hash_table_lookup (iso_3166_table, tokens[1]);
 
 	if (iso_3166_name != NULL)
-		/* Translators: The text before the "|" is context to help
-		 * you decide on the correct translation. You MUST OMIT IT
-		 * in the translated string. 
-		 * Translators: The first %s is the language name, and the
-		 * second is the locale name. Example: "French (France)" */
 		language_name = g_strdup_printf (
-			Q_("language|%s (%s)"), iso_639_name, iso_3166_name);
+		 /* Translators: The first %s is the language name, and the
+		 * second is the country name. Example: "French (France)" */
+			C_("language", "%s (%s)"), iso_639_name, iso_3166_name);
 	else
-		/* Translators: The text before the "|" is context to help
-		 * you decide on the correct translation. You MUST OMIT IT
-		 * in the translated string. 
-		 * Translators: The first %s is the language name, and the
-		 * second is the locale name. Example: "French (France)" */
 		language_name = g_strdup_printf (
-			Q_("language|%s (%s)"), iso_639_name, tokens[1]);
+		 /* Translators: The first %s is the language name, and the
+		 * second is the country name. Example: "French (France)" */
+			C_("language", "%s (%s)"), iso_639_name, tokens[1]);
 
 exit:
 	g_strfreev (tokens);
@@ -388,12 +380,9 @@
 gtkhtml_spell_language_get_name (const GtkhtmlSpellLanguage *language)
 {
 	if (language == NULL)
-		/* Translators: The text before the "|" is context to help
-		 * you decide on the correct translation. You MUST OMIT IT
-		 * in the translated string.
-		 * Translators: This refers to the default language used
+		 /* Translators: This refers to the default language used
 		 * by the spell checker. */
-		return Q_("language|Default");
+		return C_("language", "Default");
 
 	return language->name;
 }

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep  1 04:12:47 2008
@@ -44,7 +44,7 @@
 dnl Due to the sed scripts being split on 90 line
 dnl blocks, this macro needs to be right at the beggining.
 dnl
-IT_PROG_INTLTOOL([0.35.5])
+IT_PROG_INTLTOOL([0.36.3])
 
 AC_ISC_POSIX
 AC_PROG_CC