luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 23:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some errors in translated strings

Browse Source 
gettext can't handle macros, so we have to use literal format
specifiers, unfortunately.
This commit is contained in:
Matthias Clasen 2010-07-07 07:37:42 -04:00
parent bad9a3718e
commit 99670eaccc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gdbusaddress.c
View File

@ -669,10 +669,11 @@ g_dbus_address_connect (const gchar *address_entry,
if (nonce_length != 16) if (nonce_length != 16)
{ {
/* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("The nonce-file `%s' was %" G_GSIZE_FORMAT " bytes. Expected 16 bytes."), _("The nonce-file `%s' was %lu bytes. Expected 16 bytes."),
nonce_file, nonce_file,
nonce_length); nonce_length);
g_free (nonce_contents); g_free (nonce_contents);

9
gio/gdbusmessage.c
View File

@ -726,10 +726,11 @@ read_string (GMemoryInputStream *mis,
goto fail; goto fail;
if (num_read == 0) if (num_read == 0)
{ {
/* G_GSIZE_FORMAT doesn't work with gettext, so we use %lu */
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Wanted to read %" G_GSIZE_FORMAT " bytes but got EOF"), _("Wanted to read %lu bytes but got EOF"),
to_read); to_read);
goto fail; goto fail;
} }
@ -1012,10 +1013,11 @@ parse_value_from_blob (GMemoryInputStream *mis,
if (array_len > (2<<26)) if (array_len > (2<<26))
{ {
/* G_GUINT32_FORMAT doesn't work with gettext, so use u */
g_set_error (&local_error, g_set_error (&local_error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Encountered array of length %" G_GUINT32_FORMAT " bytes. Maximum length is 2<<26 bytes."), _("Encountered array of length %u bytes. Maximum length is 2<<26 bytes."),
array_len); array_len);
goto fail; goto fail;
} }
@ -1494,10 +1496,11 @@ g_dbus_message_new_from_blob (guchar *blob,
/* no signature, this is only OK if the body is empty */ /* no signature, this is only OK if the body is empty */
if (message_body_len != 0) if (message_body_len != 0)
{ {
/* G_GUINT32_FORMAT doesn't work with gettext, just use %u */
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("No signature header in message but the message body is %" G_GUINT32_FORMAT " bytes"), _("No signature header in message but the message body is %u bytes"),
message_body_len); message_body_len);
goto out; goto out;
} }