luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-14 04:57:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

GKeyFile: Unify error messsages a bit

Browse Source 
This marks a few forgotten error messages for translation, and
makes some other strings more uniform. String change!

https://bugzilla.gnome.org/show_bug.cgi?id=658715
This commit is contained in:
Matthias Clasen
2011-09-10 16:09:39 -04:00
parent ec3653be00
commit 0db179e75e
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
glib/gkeyfile.c
View File

@@ -766,8 +766,8 @@ g_key_file_parse_line (GKeyFile *key_file,
g_set_error (error, G_KEY_FILE_ERROR, g_set_error (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE, G_KEY_FILE_ERROR_PARSE,
_("Key file contains line '%s' which is not " _("Key file contains line '%s' which is not "
"a key-value pair, group, or comment"), "a key-value pair, group, or comment"),
line_utf8); line_utf8);
g_free (line_utf8); g_free (line_utf8);
return; return;
@@ -1448,7 +1448,7 @@ g_key_file_get_string (GKeyFile *key_file,
g_set_error (error, G_KEY_FILE_ERROR, g_set_error (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_INVALID_VALUE, G_KEY_FILE_ERROR_INVALID_VALUE,
_("Key file contains key '%s' " _("Key file contains key '%s' "
"which has value that cannot be interpreted."), "which has a value that cannot be interpreted."),
key); key);
g_error_free (key_file_error); g_error_free (key_file_error);
} }
@@ -1932,7 +1932,7 @@ g_key_file_get_boolean (GKeyFile *key_file,
g_set_error (error, G_KEY_FILE_ERROR, g_set_error (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_INVALID_VALUE, G_KEY_FILE_ERROR_INVALID_VALUE,
_("Key file contains key '%s' " _("Key file contains key '%s' "
"which has value that cannot be interpreted."), "which has a value that cannot be interpreted."),
key); key);
g_error_free (key_file_error); g_error_free (key_file_error);
} }
@@ -2149,8 +2149,8 @@ g_key_file_get_integer (GKeyFile *key_file,
g_set_error (error, G_KEY_FILE_ERROR, g_set_error (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_INVALID_VALUE, G_KEY_FILE_ERROR_INVALID_VALUE,
_("Key file contains key '%s' in group '%s' " _("Key file contains key '%s' in group '%s' "
"which has value that cannot be interpreted."), key, "which has a value that cannot be interpreted."),
group_name); key, group_name);
g_error_free (key_file_error); g_error_free (key_file_error);
} }
else else
@@ -2226,8 +2226,9 @@ g_key_file_get_int64 (GKeyFile *key_file,
if (*s == '\0' || *end != '\0') if (*s == '\0' || *end != '\0')
{ {
g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE, g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
"Key '%s' in group '%s' has value '%s' where int64 was expected", _("Key '%s' in group '%s' has value '%s' "
key, group_name, s); "where %s was expected"),
key, group_name, s, "int64");
return 0; return 0;
} }
@@ -2301,8 +2302,9 @@ g_key_file_get_uint64 (GKeyFile *key_file,
if (*s == '\0' || *end != '\0') if (*s == '\0' || *end != '\0')
{ {
g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE, g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
"Key '%s' in group '%s' has value '%s' where uint64 was expected", _("Key '%s' in group '%s' has value '%s' "
key, group_name, s); "where %s was expected"),
key, group_name, s, "uint64");
return 0; return 0;
} }
@@ -2513,8 +2515,8 @@ g_key_file_get_double (GKeyFile *key_file,
g_set_error (error, G_KEY_FILE_ERROR, g_set_error (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_INVALID_VALUE, G_KEY_FILE_ERROR_INVALID_VALUE,
_("Key file contains key '%s' in group '%s' " _("Key file contains key '%s' in group '%s' "
"which has value that cannot be interpreted."), key, "which has a value that cannot be interpreted."),
group_name); key, group_name);
g_error_free (key_file_error); g_error_free (key_file_error);
} }
else else