From: Matthias Clasen Date: Fri, 14 Sep 2001 19:29:35 +0000 (+0000) Subject: glib/gconvert.c (g_filename_from_uri): Replace `is contains' X-Git-Tag: GLIB_1_3_8~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=545a6a7616471a11c20d22f2ab1f2f4f621e99d1;p=platform%2Fupstream%2Fglib.git glib/gconvert.c (g_filename_from_uri): Replace `is contains' by `contains' in two error messages. (#60395) --- diff --git a/ChangeLog b/ChangeLog index 7f3e328..07fe08f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f3e328..07fe08f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ + +Fri Sep 14 20:34:27 2001 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Replace `is contains' + by `contains' in two error messages. (#60395) + 2001-09-10 Ron Steinke * glib/giochannel.h glib/giochannel.c: Added a length argument diff --git a/glib/gconvert.c b/glib/gconvert.c index c280e70..d904335 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -1235,7 +1235,7 @@ g_filename_from_uri (const char *uri, if (unescaped_hostname == NULL) { g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_INVALID_URI, - _("The hostname of the URI `%s' is contains invalidly escaped characters"), + _("The hostname of the URI `%s' contains invalidly escaped characters"), uri); return NULL; } @@ -1251,7 +1251,7 @@ g_filename_from_uri (const char *uri, if (filename == NULL) { g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_INVALID_URI, - _("The URI `%s' is contains invalidly escaped characters"), + _("The URI `%s' contains invalidly escaped characters"), uri); return NULL; }