Unify some near-duplicate strings. (#314654, Clytie Siddall)

2005-08-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/giochannel.c: Unify some near-duplicate strings. (#314654,
	Clytie Siddall)

diff --git a/ChangeLog b/ChangeLog
index 98508cb7f8447559ca6e65ff16400708cb1d37fc..15caea521e4670b046b58e30ecec38903fc49d70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/giochannel.c: Unify some near-duplicate strings. (#314654,
+       Clytie Siddall)
+       
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version to 2.9.0

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 98508cb7f8447559ca6e65ff16400708cb1d37fc..15caea521e4670b046b58e30ecec38903fc49d70 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/giochannel.c: Unify some near-duplicate strings. (#314654,
+       Clytie Siddall)
+       
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version to 2.9.0

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 98508cb7f8447559ca6e65ff16400708cb1d37fc..15caea521e4670b046b58e30ecec38903fc49d70 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-08-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/giochannel.c: Unify some near-duplicate strings. (#314654,
+       Clytie Siddall)
+       
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version to 2.9.0

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 0a3be6d370b265541f1a0e61578455bf5f047a6d..2c518c74fbca077502eca28e612e2ec3909f0707 100644 (file)
--- 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)