Clean up some cases of errno handling (#162496, noted by Tor Lillqvist),

2004-12-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystemunix.c: Clean up some cases of errno handling
	(#162496, noted by Tor Lillqvist), and use g_filename_display_name()
	for error messages. Also mark some error messages for translation,
	fix capitalization of error messages.

diff --git a/ChangeLog b/ChangeLog
index e06bb64d4003d6013dabd487c133e489db48330e..ee1d42012f196e079842943207bb21b3ef5d3760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
        * gtk/gtkfilesystemunix.c: Clean up some cases of errno handling
        (#162496, noted by Tor Lillqvist), and use g_filename_display_name()
-       for error messages.
+       for error messages. Also mark some error messages for translation,
+       fix capitalization of error messages.
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): 
        Use g_value_get_boolean() for ellipsize_set.  (#162447, 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e06bb64d4003d6013dabd487c133e489db48330e..ee1d42012f196e079842943207bb21b3ef5d3760 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -2,7 +2,8 @@
 
        * gtk/gtkfilesystemunix.c: Clean up some cases of errno handling
        (#162496, noted by Tor Lillqvist), and use g_filename_display_name()
-       for error messages.
+       for error messages. Also mark some error messages for translation,
+       fix capitalization of error messages.
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): 
        Use g_value_get_boolean() for ellipsize_set.  (#162447, 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e06bb64d4003d6013dabd487c133e489db48330e..ee1d42012f196e079842943207bb21b3ef5d3760 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -2,7 +2,8 @@
 
        * gtk/gtkfilesystemunix.c: Clean up some cases of errno handling
        (#162496, noted by Tor Lillqvist), and use g_filename_display_name()
-       for error messages.
+       for error messages. Also mark some error messages for translation,
+       fix capitalization of error messages.
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): 
        Use g_value_get_boolean() for ellipsize_set.  (#162447, 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e06bb64d4003d6013dabd487c133e489db48330e..ee1d42012f196e079842943207bb21b3ef5d3760 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -2,7 +2,8 @@
 
        * gtk/gtkfilesystemunix.c: Clean up some cases of errno handling
        (#162496, noted by Tor Lillqvist), and use g_filename_display_name()
-       for error messages.
+       for error messages. Also mark some error messages for translation,
+       fix capitalization of error messages.
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): 
        Use g_value_get_boolean() for ellipsize_set.  (#162447, 

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 4c96dc98f8e3447b2d2bb7cedfb9b45f98717a06..d6cf88fc1c40aaf26d2a7404da65f5099bd0cd88 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -412,7 +412,7 @@ gtk_file_system_unix_get_folder (GtkFileSystem     *file_system,
          g_set_error (error,
                       GTK_FILE_SYSTEM_ERROR,
                       GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                      _("error getting information for '%s': %s"),
+                      _("Error getting information for '%s': %s"),
                       display_name,
                       g_strerror (ENOENT));
 
@@ -426,7 +426,7 @@ gtk_file_system_unix_get_folder (GtkFileSystem     *file_system,
          g_set_error (error,
                       GTK_FILE_SYSTEM_ERROR,
                       GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
-                      _("%s: %s"),
+                      _("Error getting information for '%s': %s"),
                       display_name,
                       g_strerror (ENOTDIR));
 
@@ -492,7 +492,7 @@ gtk_file_system_unix_create_folder (GtkFileSystem     *file_system,
       g_set_error (error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                  _("error creating directory '%s': %s"),
+                  _("Error creating directory '%s': %s"),
                   display_name,
                   g_strerror (save_errno));
       g_free (display_name);
@@ -623,7 +623,7 @@ get_icon_type (const char *filename,
          g_set_error (error,
                       GTK_FILE_SYSTEM_ERROR,
                       GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                      _("error getting information for '%s': %s"),
+                      _("Error getting information for '%s': %s"),
                       display_name,
                       g_strerror (save_errno));
          g_free (display_name);
@@ -1440,7 +1440,7 @@ bookmark_list_write (GSList *bookmarks, GError **error)
   g_set_error (error,
               GTK_FILE_SYSTEM_ERROR,
               GTK_FILE_SYSTEM_ERROR_FAILED,
-              _("Bookmark saving failed (%s)"),
+              _("Bookmark saving failed: %s"),
               g_strerror (saved_errno));
   result = FALSE;
 
@@ -1492,7 +1492,7 @@ gtk_file_system_unix_insert_bookmark (GtkFileSystem     *file_system,
          g_set_error (error,
                       GTK_FILE_SYSTEM_ERROR,
                       GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS,
-                      "%s already exists in the bookmarks list",
+                      _("'%s' already exists in the bookmarks list"),
                       uri);
          goto out;
        }
@@ -1554,7 +1554,7 @@ gtk_file_system_unix_remove_bookmark (GtkFileSystem     *file_system,
   g_set_error (error,
               GTK_FILE_SYSTEM_ERROR,
               GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-              "%s does not exist in the bookmarks list",
+              _("'%s' does not exist in the bookmarks list"),
               uri);
 
  out:
@@ -1736,7 +1736,7 @@ gtk_file_folder_unix_get_info (GtkFileFolder      *folder,
       g_set_error (error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                  _("error getting information for '%s'"),
+                  _("Error getting information for '%s'"),
                   display_name);
       g_free (display_name);
       info = NULL;