gedit r6630 - in trunk: . plugins/spell

[pborelli svn gnome org]

Author: pborelli
Date: Sat Nov 29 10:47:23 2008
New Revision: 6630
URL: http://svn.gnome.org/viewvc/gedit?rev=6630&view=rev

Log:
2008-11-29  Paolo Borelli  <pborelli katamail com>

	* plugins/spell/gedit-spell-checker-language.c: use new C_ macro
	for translations with context. Patch by Matthias Clasen.
	* configure.ac: bump glib and intltool requirements.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/spell/gedit-spell-checker-language.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Nov 29 10:47:23 2008
@@ -28,7 +28,7 @@
 AC_DISABLE_STATIC
 
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 AC_PROG_LIBTOOL
 
@@ -194,7 +194,7 @@
 
 PKG_CHECK_MODULES(GEDIT, [
 	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.13.0
+	glib-2.0 >= 2.18.0
 	gthread-2.0 >= 2.13.0
 	gio-2.0 >= 2.16.0
 	gtk+-2.0 >= 2.13.0

Modified: trunk/plugins/spell/gedit-spell-checker-language.c
==============================================================================
--- trunk/plugins/spell/gedit-spell-checker-language.c	(original)
+++ trunk/plugins/spell/gedit-spell-checker-language.c	Sat Nov 29 10:47:23 2008
@@ -278,32 +278,26 @@
 		
 		if (localename != 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
+			/* Translators: the first %s is the language name, and the
 			 * second %s is the locale name. Example:
 			 * "French (France)"
 			 */
-			name = g_strdup_printf (Q_("language|%s (%s)"),
+			name = g_strdup_printf (C_("language", "%s (%s)"),
 						dgettext (ISO_639_DOMAIN, langname),
 						dgettext (ISO_3166_DOMAIN, localename));
 		}
 		else
 		{
-			/* Translators: The text before the "|" is context to help you decide on
-			 * the correct translation. You MUST OMIT it in the translated string. */
-			name = g_strdup_printf (Q_("language|%s (%s)"),
+			name = g_strdup_printf (C_("language", "%s (%s)"),
 						dgettext (ISO_639_DOMAIN, langname), str[1]);
 		}
 	}
 	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: this refers to an unknown language code
+		/* Translators: this refers to an unknown language code
 		 * (one which isn't in our built-in list).
 		 */
-		name = g_strdup_printf (Q_("language|Unknown (%s)"), code);
+		name = g_strdup_printf (C_("language", "Unknown (%s)"), code);
 	}
 
 	g_strfreev (str);
@@ -411,7 +405,7 @@
 		 * Translators: this refers the Default language used by the
 		 * spell checker
 		 */
-		return Q_("language|Default");
+		return C_("language", "Default");
 
 	return lang->name;
 }