diff --git a/ChangeLog b/ChangeLog index 9dc6fb8e2..f7999be3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 5 23:35:44 2004 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Quote the file + scheme to mark it as untranslatable. String change. + (#133144, Danilo Segan) + 2004-05-03 Pablo Saratxaga * configure.in: Added Walloon (wa) to ALL_LINGUAS @@ -12,6 +18,14 @@ Sun May 2 03:51:59 2004 Manish Singh * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST fixes #141563, Steve Lhomme +2004-04-30 Matthias Clasen + + * === Released 2.4.1 === + + * configure.in: Version 2.4.1, interface age 1. + + * NEWS: Updates + 2004-04-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_package_installation_subdirectory): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9dc6fb8e2..f7999be3e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed May 5 23:35:44 2004 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Quote the file + scheme to mark it as untranslatable. String change. + (#133144, Danilo Segan) + 2004-05-03 Pablo Saratxaga * configure.in: Added Walloon (wa) to ALL_LINGUAS @@ -12,6 +18,14 @@ Sun May 2 03:51:59 2004 Manish Singh * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST fixes #141563, Steve Lhomme +2004-04-30 Matthias Clasen + + * === Released 2.4.1 === + + * configure.in: Version 2.4.1, interface age 1. + + * NEWS: Updates + 2004-04-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_package_installation_subdirectory): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9dc6fb8e2..f7999be3e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Wed May 5 23:35:44 2004 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Quote the file + scheme to mark it as untranslatable. String change. + (#133144, Danilo Segan) + 2004-05-03 Pablo Saratxaga * configure.in: Added Walloon (wa) to ALL_LINGUAS @@ -12,6 +18,14 @@ Sun May 2 03:51:59 2004 Manish Singh * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST fixes #141563, Steve Lhomme +2004-04-30 Matthias Clasen + + * === Released 2.4.1 === + + * configure.in: Version 2.4.1, interface age 1. + + * NEWS: Updates + 2004-04-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_package_installation_subdirectory): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9dc6fb8e2..f7999be3e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed May 5 23:35:44 2004 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Quote the file + scheme to mark it as untranslatable. String change. + (#133144, Danilo Segan) + 2004-05-03 Pablo Saratxaga * configure.in: Added Walloon (wa) to ALL_LINGUAS @@ -12,6 +18,14 @@ Sun May 2 03:51:59 2004 Manish Singh * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST fixes #141563, Steve Lhomme +2004-04-30 Matthias Clasen + + * === Released 2.4.1 === + + * configure.in: Version 2.4.1, interface age 1. + + * NEWS: Updates + 2004-04-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_package_installation_subdirectory): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9dc6fb8e2..f7999be3e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed May 5 23:35:44 2004 Matthias Clasen + + * glib/gconvert.c (g_filename_from_uri): Quote the file + scheme to mark it as untranslatable. String change. + (#133144, Danilo Segan) + 2004-05-03 Pablo Saratxaga * configure.in: Added Walloon (wa) to ALL_LINGUAS @@ -12,6 +18,14 @@ Sun May 2 03:51:59 2004 Manish Singh * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST fixes #141563, Steve Lhomme +2004-04-30 Matthias Clasen + + * === Released 2.4.1 === + + * configure.in: Version 2.4.1, interface age 1. + + * NEWS: Updates + 2004-04-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_package_installation_subdirectory): diff --git a/glib/gconvert.c b/glib/gconvert.c index 3a17a2696..06a6ca2ce 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -1494,7 +1494,7 @@ g_filename_from_uri (const gchar *uri, if (!has_case_prefix (uri, "file:/")) { g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI, - _("The URI '%s' is not an absolute URI using the file scheme"), + _("The URI '%s' is not an absolute URI using the \"file\" scheme"), uri); return NULL; }