From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 28 Aug 2005 06:11:55 +0000 (+0000)
Subject: Unify some near-duplicate strings. (#314654, Clytie Siddall)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f60ede172472b49ac9af521ef71c2fd3aa5fc6d0;p=dana%2Fcg-glib.git

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 98508cb7..15caea52 100644
--- 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 98508cb7..15caea52 100644
--- 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 98508cb7..15caea52 100644
--- 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 0a3be6d3..2c518c74 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)