From f60ede172472b49ac9af521ef71c2fd3aa5fc6d0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Aug 2005 06:11:55 +0000 Subject: [PATCH] Unify some near-duplicate strings. (#314654, Clytie Siddall) 2005-08-28 Matthias Clasen * glib/giochannel.c: Unify some near-duplicate strings. (#314654, Clytie Siddall) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ glib/giochannel.c | 4 ++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98508cb7f..15caea521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-28 Matthias Clasen + + * glib/giochannel.c: Unify some near-duplicate strings. (#314654, + Clytie Siddall) + 2005-08-26 Matthias Clasen * configure.in: Bump version to 2.9.0 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 98508cb7f..15caea521 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-28 Matthias Clasen + + * glib/giochannel.c: Unify some near-duplicate strings. (#314654, + Clytie Siddall) + 2005-08-26 Matthias Clasen * configure.in: Bump version to 2.9.0 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 98508cb7f..15caea521 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-08-28 Matthias Clasen + + * glib/giochannel.c: Unify some near-duplicate strings. (#314654, + Clytie Siddall) + 2005-08-26 Matthias Clasen * configure.in: Bump version to 2.9.0 diff --git a/glib/giochannel.c b/glib/giochannel.c index 0a3be6d37..2c518c74f 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -1147,11 +1147,11 @@ g_io_channel_set_encoding (GIOChannel *channel, if (err == EINVAL) g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION, - _("Conversion from character set `%s' to `%s' is not supported"), + _("Conversion from character set '%s' to '%s' is not supported"), from_enc, to_enc); else g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, - _("Could not open converter from `%s' to `%s': %s"), + _("Could not open converter from '%s' to '%s': %s"), from_enc, to_enc, g_strerror (err)); if (read_cd != (GIConv) -1)