From 3b4f716bd90496cee09829ad226ec21391237a30 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 26 Dec 2010 13:12:11 +0000 Subject: [PATCH] Code cleanup --- po/de.po | 41 +++++++++++++++++++++++------------------ po/es.po | 41 +++++++++++++++++++++++------------------ po/fr.po | 45 +++++++++++++++++++++++++-------------------- po/it.po | 41 +++++++++++++++++++++++------------------ src/callbacks.c | 20 +++++++++++++------- 5 files changed, 107 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 91a5e38..a394fab 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 14:04+0100\n" +"POT-Creation-Date: 2010-12-26 14:10+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -267,49 +267,50 @@ msgstr "Aktualisierung..." msgid "New folder" msgstr "Neu Ordner" -#: ../src/callbacks.c:192 ../src/callbacks.c:197 ../src/callbacks.c:1021 -#: ../src/callbacks.c:1024 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:193 ../src/callbacks.c:199 ../src/callbacks.c:1025 +#: ../src/callbacks.c:1030 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "Achtung" -#: ../src/callbacks.c:195 ../src/desktopicon.c:851 -msgid "Are you sure you want to delete " +#: ../src/callbacks.c:197 +#, c-format +msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:196 ../src/desktopicon.c:852 -msgid " file(s)?" -msgstr "" - -#: ../src/callbacks.c:756 +#: ../src/callbacks.c:758 msgid "New" msgstr "Neu" -#: ../src/callbacks.c:761 ../src/callbacks.c:765 ../src/desktop.c:334 +#: ../src/callbacks.c:763 ../src/callbacks.c:767 ../src/desktop.c:334 msgid "Folder" msgstr "Ordner" -#: ../src/callbacks.c:772 ../src/desktop.c:342 +#: ../src/callbacks.c:774 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:776 ../src/desktop.c:346 +#: ../src/callbacks.c:778 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:856 +#: ../src/callbacks.c:858 msgid "Open in new _window" msgstr "Offnen in neue Fenster" -#: ../src/callbacks.c:884 +#: ../src/callbacks.c:886 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:919 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:921 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "Offnen _mit..." +#: ../src/callbacks.c:1029 ../src/desktopicon.c:800 +msgid "Are you sure you want to execute this file?" +msgstr "" + #: ../src/common.c:61 msgid "copying" msgstr "" @@ -483,8 +484,12 @@ msgid "" " -m\tMonitor where to display the desktop\n" msgstr "" -#: ../src/desktopicon.c:800 -msgid "Are you sure you want to execute this file?" +#: ../src/desktopicon.c:851 +msgid "Are you sure you want to delete " +msgstr "" + +#: ../src/desktopicon.c:852 +msgid " file(s)?" msgstr "" #: ../src/main.c:44 diff --git a/po/es.po b/po/es.po index 6068ab4..69e1321 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 14:04+0100\n" +"POT-Creation-Date: 2010-12-26 14:10+0100\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -267,49 +267,50 @@ msgstr "" msgid "New folder" msgstr "" -#: ../src/callbacks.c:192 ../src/callbacks.c:197 ../src/callbacks.c:1021 -#: ../src/callbacks.c:1024 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:193 ../src/callbacks.c:199 ../src/callbacks.c:1025 +#: ../src/callbacks.c:1030 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "" -#: ../src/callbacks.c:195 ../src/desktopicon.c:851 -msgid "Are you sure you want to delete " +#: ../src/callbacks.c:197 +#, c-format +msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:196 ../src/desktopicon.c:852 -msgid " file(s)?" -msgstr "" - -#: ../src/callbacks.c:756 +#: ../src/callbacks.c:758 msgid "New" msgstr "" -#: ../src/callbacks.c:761 ../src/callbacks.c:765 ../src/desktop.c:334 +#: ../src/callbacks.c:763 ../src/callbacks.c:767 ../src/desktop.c:334 msgid "Folder" msgstr "" -#: ../src/callbacks.c:772 ../src/desktop.c:342 +#: ../src/callbacks.c:774 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:776 ../src/desktop.c:346 +#: ../src/callbacks.c:778 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:856 +#: ../src/callbacks.c:858 msgid "Open in new _window" msgstr "" -#: ../src/callbacks.c:884 +#: ../src/callbacks.c:886 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:919 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:921 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "" +#: ../src/callbacks.c:1029 ../src/desktopicon.c:800 +msgid "Are you sure you want to execute this file?" +msgstr "" + #: ../src/common.c:61 msgid "copying" msgstr "" @@ -483,8 +484,12 @@ msgid "" " -m\tMonitor where to display the desktop\n" msgstr "" -#: ../src/desktopicon.c:800 -msgid "Are you sure you want to execute this file?" +#: ../src/desktopicon.c:851 +msgid "Are you sure you want to delete " +msgstr "" + +#: ../src/desktopicon.c:852 +msgid " file(s)?" msgstr "" #: ../src/main.c:44 diff --git a/po/fr.po b/po/fr.po index 7b2cf45..3ad2b3f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 14:04+0100\n" +"POT-Creation-Date: 2010-12-26 14:10+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -267,49 +267,50 @@ msgstr "Actualisation du dossier..." msgid "New folder" msgstr "Nouveau dossier" -#: ../src/callbacks.c:192 ../src/callbacks.c:197 ../src/callbacks.c:1021 -#: ../src/callbacks.c:1024 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:193 ../src/callbacks.c:199 ../src/callbacks.c:1025 +#: ../src/callbacks.c:1030 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "Avertissement" -#: ../src/callbacks.c:195 ../src/desktopicon.c:851 -msgid "Are you sure you want to delete " -msgstr "Voulez-vous vraiment effacer " +#: ../src/callbacks.c:197 +#, c-format +msgid "Are you sure you want to delete %lu file(s)?" +msgstr "Voulez-vous vraiment effacer %lu fichier(s)?" -#: ../src/callbacks.c:196 ../src/desktopicon.c:852 -msgid " file(s)?" -msgstr " fichier(s) ?" - -#: ../src/callbacks.c:756 +#: ../src/callbacks.c:758 msgid "New" msgstr "Nouveau" -#: ../src/callbacks.c:761 ../src/callbacks.c:765 ../src/desktop.c:334 +#: ../src/callbacks.c:763 ../src/callbacks.c:767 ../src/desktop.c:334 msgid "Folder" msgstr "Dossier" -#: ../src/callbacks.c:772 ../src/desktop.c:342 +#: ../src/callbacks.c:774 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "Lien symbolique..." -#: ../src/callbacks.c:776 ../src/desktop.c:346 +#: ../src/callbacks.c:778 ../src/desktop.c:346 msgid "Text file" msgstr "Fichier texte" -#: ../src/callbacks.c:856 +#: ../src/callbacks.c:858 msgid "Open in new _window" msgstr "Ouvrir dans une _nouvelle fenêtre" -#: ../src/callbacks.c:884 +#: ../src/callbacks.c:886 msgid "_Unmount" msgstr "Démonter" -#: ../src/callbacks.c:919 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:921 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "Ouvrir _avec..." +#: ../src/callbacks.c:1029 ../src/desktopicon.c:800 +msgid "Are you sure you want to execute this file?" +msgstr "Voulez-vous vraiment exécuter ce fichier ?" + #: ../src/common.c:61 msgid "copying" msgstr "copie en cours" @@ -511,9 +512,13 @@ msgstr "" " -h\tAfficher l'écran d'accueil\n" " -m\tMoniteur où afficher le bureau\n" -#: ../src/desktopicon.c:800 -msgid "Are you sure you want to execute this file?" -msgstr "Voulez-vous vraiment exécuter ce fichier ?" +#: ../src/desktopicon.c:851 +msgid "Are you sure you want to delete " +msgstr "Voulez-vous vraiment effacer " + +#: ../src/desktopicon.c:852 +msgid " file(s)?" +msgstr " fichier(s) ?" #: ../src/main.c:44 msgid "Usage: browser [directory...]\n" diff --git a/po/it.po b/po/it.po index 23e33c0..9bd917a 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 14:04+0100\n" +"POT-Creation-Date: 2010-12-26 14:10+0100\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -267,49 +267,50 @@ msgstr "" msgid "New folder" msgstr "" -#: ../src/callbacks.c:192 ../src/callbacks.c:197 ../src/callbacks.c:1021 -#: ../src/callbacks.c:1024 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:193 ../src/callbacks.c:199 ../src/callbacks.c:1025 +#: ../src/callbacks.c:1030 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "" -#: ../src/callbacks.c:195 ../src/desktopicon.c:851 -msgid "Are you sure you want to delete " +#: ../src/callbacks.c:197 +#, c-format +msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:196 ../src/desktopicon.c:852 -msgid " file(s)?" -msgstr "" - -#: ../src/callbacks.c:756 +#: ../src/callbacks.c:758 msgid "New" msgstr "" -#: ../src/callbacks.c:761 ../src/callbacks.c:765 ../src/desktop.c:334 +#: ../src/callbacks.c:763 ../src/callbacks.c:767 ../src/desktop.c:334 msgid "Folder" msgstr "" -#: ../src/callbacks.c:772 ../src/desktop.c:342 +#: ../src/callbacks.c:774 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:776 ../src/desktop.c:346 +#: ../src/callbacks.c:778 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:856 +#: ../src/callbacks.c:858 msgid "Open in new _window" msgstr "" -#: ../src/callbacks.c:884 +#: ../src/callbacks.c:886 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:919 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:921 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "" +#: ../src/callbacks.c:1029 ../src/desktopicon.c:800 +msgid "Are you sure you want to execute this file?" +msgstr "" + #: ../src/common.c:61 msgid "copying" msgstr "" @@ -483,8 +484,12 @@ msgid "" " -m\tMonitor where to display the desktop\n" msgstr "" -#: ../src/desktopicon.c:800 -msgid "Are you sure you want to execute this file?" +#: ../src/desktopicon.c:851 +msgid "Are you sure you want to delete " +msgstr "" + +#: ../src/desktopicon.c:852 +msgid " file(s)?" msgstr "" #: ../src/main.c:44 diff --git a/src/callbacks.c b/src/callbacks.c index 1e96141..72082f0 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -188,12 +188,14 @@ void on_edit_delete(gpointer data) dialog = gtk_message_dialog_new(GTK_WINDOW(browser->window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s", - _("Warning")); + GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, +#if GTK_CHECK_VERSION(2, 6, 0) + "%s", _("Warning")); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG( - dialog), "%s%lu%s", - _("Are you sure you want to delete "), cnt, - _(" file(s)?")); + dialog), +#endif + _("Are you sure you want to delete %lu" + " file(s)?"), cnt); gtk_window_set_title(GTK_WINDOW(dialog), _("Warning")); res = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -1018,9 +1020,13 @@ static void _on_icon_run(gpointer data) dialog = gtk_message_dialog_new(GTK_WINDOW(cb->browser->window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, - GTK_BUTTONS_YES_NO, "%s", _("Warning")); + GTK_BUTTONS_YES_NO, "%s", +#if GTK_CHECK_VERSION(2, 6, 0) + _("Warning")); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), - "%s", "Are you sure you want to execute this file?"); + "%s", +#endif + _("Are you sure you want to execute this file?")); gtk_window_set_title(GTK_WINDOW(dialog), _("Warning")); res = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);