gconf r2504 - in trunk: . gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Jan  8 14:48:31 2008
New Revision: 2504
URL: http://svn.gnome.org/viewvc/gconf?rev=2504&view=rev

Log:
2008-01-08  Kjartan Maraas  <kmaraas gnome org>

	* NEWS: Update some.
	* gconf/gconf.c: (gconf_valid_key):
	Fix some more strings. Closes bug #429679.

Modified:
   trunk/ChangeLog
   trunk/gconf/gconf.c

Modified: trunk/gconf/gconf.c
==============================================================================
--- trunk/gconf/gconf.c	(original)
+++ trunk/gconf/gconf.c	Tue Jan  8 14:48:31 2008
@@ -2620,7 +2620,7 @@
   if (*key != '/')
     {
       if (why_invalid != NULL)
-        *why_invalid = g_strdup(_("Must begin with a slash (/)"));
+        *why_invalid = g_strdup(_("Must begin with a slash '/'"));
       return FALSE;
     }
   
@@ -2642,9 +2642,9 @@
               if (why_invalid != NULL)
                 {
                   if (*s == '/')
-                    *why_invalid = g_strdup(_("Can't have two slashes (/) in a row"));
+                    *why_invalid = g_strdup(_("Can't have two slashes '/' in a row"));
                   else
-                    *why_invalid = g_strdup(_("Can't have a period (.) right after a slash (/)"));
+                    *why_invalid = g_strdup(_("Can't have a period '.' right after a slash '/'"));
                 }
               return FALSE;
             }
@@ -2664,7 +2664,7 @@
           if (c > 127)
             {
               if (why_invalid != NULL)
-                *why_invalid = g_strdup_printf (_("'\\%o' is not an ASCII character, so isn't allowed in key names"),
+                *why_invalid = g_strdup_printf (_("'\\%o' is not an ASCII character and thus isn't allowed in key names"),
                                                 (guint) c);
               return FALSE;
             }
@@ -2688,7 +2688,7 @@
   if (just_saw_slash)
     {
       if (why_invalid != NULL)
-        *why_invalid = g_strdup(_("Key/directory may not end with a slash (/)"));
+        *why_invalid = g_strdup(_("Key/directory may not end with a slash '/'"));
       return FALSE;
     }
   else