diff --git a/ChangeLog b/ChangeLog index e22b4e263..6e822ef16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e22b4e263..6e822ef16 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-01-19 Kjartan Maraas + + * gconvert.c: Fix typo. + * gfileutils.c: Same here. + * configure.in: Added no to ALL_LINGUAS + 2001-01-17 Tor Lillqvist * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc diff --git a/configure.in b/configure.in index 5876e1970..7722c2a4e 100644 --- a/configure.in +++ b/configure.in @@ -181,7 +181,7 @@ dnl dnl gettext support dnl -ALL_LINGUAS="" +ALL_LINGUAS="no" AM_GLIB_GNU_GETTEXT LIBS="$LIBS $INTLLIBS" diff --git a/gconvert.c b/gconvert.c index 9307f43e8..17ba928ea 100644 --- a/gconvert.c +++ b/gconvert.c @@ -92,7 +92,7 @@ open_converter (const gchar *to_codeset, /* Something went wrong. */ if (errno == EINVAL) g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION, - _("Conversion from character set `%s' to `%s' is not suppo\rted"), + _("Conversion from character set `%s' to `%s' is not supported"), from_codeset, to_codeset); else g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, diff --git a/gfileutils.c b/gfileutils.c index 0777530b5..7a03315f8 100644 --- a/gfileutils.c +++ b/gfileutils.c @@ -646,7 +646,7 @@ g_file_open_tmp (const char *tmpl, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Template '%s' doesn end with XXXXXX"), + _("Template '%s' doesn't end with XXXXXX"), tmpl); return -1; } diff --git a/glib/gconvert.c b/glib/gconvert.c index 9307f43e8..17ba928ea 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -92,7 +92,7 @@ open_converter (const gchar *to_codeset, /* Something went wrong. */ if (errno == EINVAL) g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION, - _("Conversion from character set `%s' to `%s' is not suppo\rted"), + _("Conversion from character set `%s' to `%s' is not supported"), from_codeset, to_codeset); else g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 0777530b5..7a03315f8 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -646,7 +646,7 @@ g_file_open_tmp (const char *tmpl, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Template '%s' doesn end with XXXXXX"), + _("Template '%s' doesn't end with XXXXXX"), tmpl); return -1; }