# HG changeset patch # User zas_ # Date 1219584128 0 # Node ID 50e1f5e54c1af7bdabf80973e7e1c35cad875b36 # Parent 788eaa70a5c4b9cb41503ed981c59fce981b302d Fix untranslated messages. French translation and POTFILES.in were updated. diff -r 788eaa70a5c4 -r 50e1f5e54c1a po/POTFILES.in --- a/po/POTFILES.in Sun Aug 24 10:00:40 2008 +0000 +++ b/po/POTFILES.in Sun Aug 24 13:22:08 2008 +0000 @@ -39,6 +39,7 @@ ./src/thumb.c ./src/trash.c ./src/ui_bookmark.c +./src/ui_fileops.c ./src/ui_help.c ./src/ui_pathsel.c ./src/ui_tabcomp.c diff -r 788eaa70a5c4 -r 50e1f5e54c1a po/fr.po --- a/po/fr.po Sun Aug 24 10:00:40 2008 +0000 +++ b/po/fr.po Sun Aug 24 13:22:08 2008 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: geeqie-1.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-24 11:49+0200\n" -"PO-Revision-Date: 2008-08-24 11:58+0100\n" +"POT-Creation-Date: 2008-08-24 15:12+0200\n" +"PO-Revision-Date: 2008-08-24 15:19+0100\n" "Last-Translator: Laurent Monin \n" "Language-Team: french \n" "MIME-Version: 1.0\n" @@ -3912,6 +3912,73 @@ msgid "_Remove" msgstr "Efface_r" +#: src/ui_fileops.c:94 +msgid "" +"One or more filenames are not encoded with the preferred locale character " +"set.\n" +msgstr "" +"Un ou plusieurs noms de fichiers ne sont pas encodés dans la jeu de " +"caractères de la locale préférée.\n" + +#: src/ui_fileops.c:95 +#, c-format +msgid "Operations on, and display of these files with %s may not succeed.\n" +msgstr "" +"Les opérations sur, et l'affichage de ces fichiers avec %s peuvent ne pas " +"fonctionner.\n" + +#: src/ui_fileops.c:97 +msgid "" +"If your filenames are not encoded in utf-8, try setting the environment " +"variable G_BROKEN_FILENAMES=1\n" +msgstr "" +"Si vos noms de fichiers ne sont pas encodés en utf-8, essayez de modifier la " +"variable d'environnement G_BROKEN_FILENAMES=1\n" + +#: src/ui_fileops.c:99 +#, c-format +msgid "It appears G_BROKEN_FILENAMES is set to %s\n" +msgstr "Il apparait que G_BROKEN_FILENAMES a pour valeur %s\n" + +#: src/ui_fileops.c:101 +msgid "It appears G_BROKEN_FILENAMES is not set\n" +msgstr "Il apparait que G_BROKEN_FILENAMES n'a pas de valeur\n" + +#: src/ui_fileops.c:103 +#, c-format +msgid "" +"The locale appears to be set to \"%s\"\n" +"(set by the LANG environment variable)\n" +msgstr "" +"La locale a pour valeur \"%s\"\n" +"(affectée par la variable d'environnement LANG)\n" + +#: src/ui_fileops.c:108 +msgid "" +"\n" +"Preferred encoding appears to be UTF-8, however the file:\n" +msgstr "" +"\n" +"L'encodage préféré apparait être UTF-8, toutefois le fichier:\n" + +#: src/ui_fileops.c:109 src/ui_fileops.c:112 src/ui_fileops.c:114 +msgid "[name not displayable]" +msgstr "[nom impossible à afficher]" + +#: src/ui_fileops.c:112 +#, c-format +msgid "\"%s\" is encoded in valid UTF-8." +msgstr "\"%s\" est encodé en UTF-8 valide." + +#: src/ui_fileops.c:114 +#, c-format +msgid "\"%s\" is not encoded in valid UTF-8." +msgstr "\"%s\" n'est pas encodé en UTF-8 valide." + +#: src/ui_fileops.c:119 src/ui_fileops.c:124 +msgid "Filename encoding locale mismatch" +msgstr "Discordance d'encodage entre la locale et les noms de fichiers" + #: src/ui_help.c:114 #, c-format msgid "" @@ -3921,6 +3988,11 @@ "Impossible de lancer la commande :\n" "%s" +#: src/ui_pathsel.c:433 src/ui_pathsel.c:439 src/utilops.c:1665 +#: src/utilops.c:1683 src/utilops.c:2101 +msgid "Rename failed" +msgstr "Echec de renommage" + #: src/ui_pathsel.c:438 #, c-format msgid "Failed to rename %s to %s." @@ -4139,10 +4211,6 @@ msgid "This will copy the following files" msgstr "Ceci copiera les fichiers suivants" -#: src/utilops.c:1665 src/utilops.c:1683 src/utilops.c:2101 -msgid "Rename failed" -msgstr "Echec de renommage" - #: src/utilops.c:1679 src/utilops.c:2097 msgid "Rename" msgstr "Renommer" diff -r 788eaa70a5c4 -r 50e1f5e54c1a src/ui_fileops.c --- a/src/ui_fileops.c Sun Aug 24 10:00:40 2008 +0000 +++ b/src/ui_fileops.c Sun Aug 24 13:22:08 2008 +0000 @@ -91,30 +91,37 @@ warned_user = TRUE; string = g_string_new(""); - g_string_append(string, "One or more filenames are not encoded with the preferred locale character set.\n"); - g_string_append_printf(string, "Operations on, and display of these files with %s may not succeed.\n\n", PACKAGE); - g_string_append(string, "If your filenames are not encoded in utf-8, try setting\n"); - g_string_append(string, "the environment variable G_BROKEN_FILENAMES=1\n"); - g_string_append_printf(string, "It appears G_BROKEN_FILENAMES is %s%s\n\n", - (bf) ? "set to " : "not set.", (bf) ? bf : ""); - g_string_append_printf(string, "The locale appears to be set to \"%s\"\n(set by the LANG environment variable)\n", (lc) ? lc : "undefined"); + g_string_append(string, _("One or more filenames are not encoded with the preferred locale character set.\n")); + g_string_append_printf(string, _("Operations on, and display of these files with %s may not succeed.\n"), PACKAGE); + g_string_append(string, "\n"); + g_string_append(string, _("If your filenames are not encoded in utf-8, try setting the environment variable G_BROKEN_FILENAMES=1\n")); + if (bf) + g_string_append_printf(string, _("It appears G_BROKEN_FILENAMES is set to %s\n"), bf); + else + g_string_append(string, _("It appears G_BROKEN_FILENAMES is not set\n")); + g_string_append(string, "\n"); + g_string_append_printf(string, _("The locale appears to be set to \"%s\"\n(set by the LANG environment variable)\n"), (lc) ? lc : "undefined"); if (lc && (strstr(lc, "UTF-8") || strstr(lc, "utf-8"))) { gchar *name; name = g_convert(path, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); - string = g_string_append(string, "\nPreferred encoding appears to be UTF-8, however the file:\n"); - g_string_append_printf(string, "\"%s\"\n%s encoded in valid UTF-8.\n", - (name) ? name : "[name not displayable]", - (g_utf8_validate(path, -1, NULL)) ? "is": "is NOT"); + string = g_string_append(string, _("\nPreferred encoding appears to be UTF-8, however the file:\n")); + g_string_append_printf(string, "\"%s\"\n", (name) ? name : _("[name not displayable]")); + + if (g_utf8_validate(path, -1, NULL)) + g_string_append_printf(string, _("\"%s\" is encoded in valid UTF-8."), (name) ? name : _("[name not displayable]")); + else + g_string_append_printf(string, _("\"%s\" is not encoded in valid UTF-8."), (name) ? name : _("[name not displayable]")); + g_string_append(string, "\n"); g_free(name); } - gd = generic_dialog_new("Filename encoding locale mismatch", + gd = generic_dialog_new(_("Filename encoding locale mismatch"), GQ_WMCLASS, "locale warning", NULL, TRUE, NULL, NULL); generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, - "Filename encoding locale mismatch", string->str); + _("Filename encoding locale mismatch"), string->str); gtk_widget_show(gd->dialog); diff -r 788eaa70a5c4 -r 50e1f5e54c1a src/ui_pathsel.c --- a/src/ui_pathsel.c Sun Aug 24 10:00:40 2008 +0000 +++ b/src/ui_pathsel.c Sun Aug 24 13:22:08 2008 +0000 @@ -430,13 +430,13 @@ if (isname(new_path)) { buf = g_strdup_printf(_("A file with name %s already exists."), new); - warning_dialog("Rename failed", buf, GTK_STOCK_DIALOG_INFO, dd->entry); + warning_dialog(_("Rename failed"), buf, GTK_STOCK_DIALOG_INFO, dd->entry); g_free(buf); } else if (!rename_file(old_path, new_path)) { buf = g_strdup_printf(_("Failed to rename %s to %s."), old, new); - warning_dialog("Rename failed", buf, GTK_STOCK_DIALOG_ERROR, dd->entry); + warning_dialog(_("Rename failed"), buf, GTK_STOCK_DIALOG_ERROR, dd->entry); g_free(buf); } else