diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-02 19:52:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-02 19:52:48 +0000 |
| commit | 78c7c07f3bc3570ec53927d88b63238ed9b21981 (patch) | |
| tree | 2287690a726ec3a8810825d2f72932434c1a178d | |
| parent | 129ad4b48db80f8c031254ef63dcee6beb552a83 (diff) | |
| download | gtk+-78c7c07f3bc3570ec53927d88b63238ed9b21981.tar.gz | |
Call setlocale().
2007-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c (main): Call setlocale().
* gtk/gtkfilesel.c:
* gtk/gtkfilesystemunix.c:
* gtk/gtkfilesystemwin32.c:
* gtk/gtkfilechoosersettings.c:
* gtk/updateiconcache.c: Consistently use folder instead of
directory in translated messages. (#344584, Javier F. Serrador)
svn path=/trunk/; revision=17024
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gtk/gtkfilechoosersettings.c | 4 | ||||
| -rw-r--r-- | gtk/gtkfilesel.c | 4 | ||||
| -rw-r--r-- | gtk/gtkfilesystemunix.c | 2 | ||||
| -rw-r--r-- | gtk/gtkfilesystemwin32.c | 2 | ||||
| -rw-r--r-- | gtk/updateiconcache.c | 4 |
6 files changed, 20 insertions, 7 deletions
@@ -1,5 +1,16 @@ 2007-01-02 Matthias Clasen <mclasen@redhat.com> + * gtk/updateiconcache.c (main): Call setlocale(). + + * gtk/gtkfilesel.c: + * gtk/gtkfilesystemunix.c: + * gtk/gtkfilesystemwin32.c: + * gtk/gtkfilechoosersettings.c: + * gtk/updateiconcache.c: Consistently use folder instead of + directory in translated messages. (#344584, Javier F. Serrador) + +2007-01-02 Matthias Clasen <mclasen@redhat.com> + Try to fix #315732, reported by Luke Hutchinson: * gdk/x11/xsettings-client.[hc]: diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c index 1644eccf97..e7026b9eb4 100644 --- a/gtk/gtkfilechoosersettings.c +++ b/gtk/gtkfilechoosersettings.c @@ -513,8 +513,8 @@ _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings, g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno), - _("Could not create directory: %s"), - dirname); + _("Error creating folder '%s': %s"), + dirname, g_strerror (saved_errno)); goto out; } diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 4cd5ee5037..84090d1060 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -1405,7 +1405,7 @@ gtk_file_selection_create_dir_confirmed (GtkWidget *widget, if (g_error_matches (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE)) buf = g_strdup_printf (_("The folder name \"%s\" contains symbols that are not allowed in filenames"), dirname); else - buf = g_strdup_printf (_("Error creating directory '%s': %s"), + buf = g_strdup_printf (_("Error creating folder '%s': %s"), dirname, error->message); gtk_file_selection_fileop_error (fs, buf); g_error_free (error); @@ -1414,7 +1414,7 @@ gtk_file_selection_create_dir_confirmed (GtkWidget *widget, if (g_mkdir (sys_full_path, 0777) < 0) { - buf = g_strdup_printf (_("Error creating directory '%s': %s"), + buf = g_strdup_printf (_("Error creating folder '%s': %s"), dirname, g_strerror (errno)); gtk_file_selection_fileop_error (fs, buf); } diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 618df2ef7c..3df4932315 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -1044,7 +1044,7 @@ gtk_file_system_unix_create_folder (GtkFileSystem *file_syst g_set_error (&error, GTK_FILE_SYSTEM_ERROR, GTK_FILE_SYSTEM_ERROR_NONEXISTENT, - _("Error creating directory '%s': %s"), + _("Error creating folder '%s': %s"), display_name, g_strerror (save_errno)); diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index 2b3c98ab59..a28a7446f3 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -1161,7 +1161,7 @@ gtk_file_system_win32_create_folder (GtkFileSystem *file_syst g_set_error (&error, GTK_FILE_SYSTEM_ERROR, GTK_FILE_SYSTEM_ERROR_NONEXISTENT, - _("Error creating directory '%s': %s"), + _("Error creating folder '%s': %s"), display_filename, g_strerror (save_errno)); diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c index f19d03c9c3..f679b6dc9b 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c @@ -1125,7 +1125,7 @@ write_file (FILE *cache, GHashTable *files, GList *directories) if (!write_dir_index (cache, new_offset, directories)) { - g_printerr (_("Failed to write directory index\n")); + g_printerr (_("Failed to write folder index\n")); return FALSE; } @@ -1296,6 +1296,8 @@ main (int argc, char **argv) if (argc < 2) return 0; + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |