From c8dccdbcd5509d3378f76c0e82cbb53cfa7263ee Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 27 Nov 2010 15:30:31 +0000 Subject: [PATCH] The error dialog looks nicer --- po/de.po | 36 ++++++++++++++++++------------------ po/es.po | 36 ++++++++++++++++++------------------ po/fr.po | 36 ++++++++++++++++++------------------ po/it.po | 36 ++++++++++++++++++------------------ src/download.c | 8 +++++++- 5 files changed, 79 insertions(+), 73 deletions(-) diff --git a/po/de.po b/po/de.po index bb6585b..2580e7f 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-27 16:26+0100\n" +"POT-Creation-Date: 2010-11-27 16:30+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -36,7 +36,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,7 +58,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" @@ -94,63 +94,63 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 -#: ../src/surfer.c:798 +#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 +#: ../src/surfer.c:795 ../src/surfer.c:798 msgid "Error" msgstr "Fehler" -#: ../src/download.c:303 ../src/download.c:329 +#: ../src/download.c:309 ../src/download.c:335 msgid "kB" msgstr "" -#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 msgid "MB" msgstr "" -#: ../src/download.c:326 +#: ../src/download.c:332 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:337 +#: ../src/download.c:343 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:356 +#: ../src/download.c:362 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:479 +#: ../src/download.c:485 msgid "Error " msgstr "Fehler " -#: ../src/download.c:504 ../src/download.c:628 +#: ../src/download.c:510 ../src/download.c:634 msgid "Complete" msgstr "" -#: ../src/download.c:512 ../src/download.c:638 +#: ../src/download.c:518 ../src/download.c:644 msgid "Downloading" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:529 msgid "Redirected to" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:539 msgid "Resolved" msgstr "" -#: ../src/download.c:541 +#: ../src/download.c:547 msgid "Code " msgstr "" -#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:659 +#: ../src/download.c:665 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tfile to write document to\n" diff --git a/po/es.po b/po/es.po index 3a7508e..c3eee50 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-27 16:26+0100\n" +"POT-Creation-Date: 2010-11-27 16:30+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -36,7 +36,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,7 +58,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" @@ -94,63 +94,63 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 -#: ../src/surfer.c:798 +#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 +#: ../src/surfer.c:795 ../src/surfer.c:798 msgid "Error" msgstr "" -#: ../src/download.c:303 ../src/download.c:329 +#: ../src/download.c:309 ../src/download.c:335 msgid "kB" msgstr "" -#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 msgid "MB" msgstr "" -#: ../src/download.c:326 +#: ../src/download.c:332 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:337 +#: ../src/download.c:343 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:356 +#: ../src/download.c:362 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:479 +#: ../src/download.c:485 msgid "Error " msgstr "" -#: ../src/download.c:504 ../src/download.c:628 +#: ../src/download.c:510 ../src/download.c:634 msgid "Complete" msgstr "" -#: ../src/download.c:512 ../src/download.c:638 +#: ../src/download.c:518 ../src/download.c:644 msgid "Downloading" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:529 msgid "Redirected to" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:539 msgid "Resolved" msgstr "" -#: ../src/download.c:541 +#: ../src/download.c:547 msgid "Code " msgstr "" -#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:659 +#: ../src/download.c:665 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tfile to write document to\n" diff --git a/po/fr.po b/po/fr.po index c718777..af211ad 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-27 16:26+0100\n" +"POT-Creation-Date: 2010-11-27 16:30+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -36,7 +36,7 @@ msgstr "Général" msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "Connecté" @@ -58,7 +58,7 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "Délai dépassé" @@ -94,63 +94,63 @@ msgstr "0.0 Kio/s" msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" -#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 -#: ../src/surfer.c:798 +#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 +#: ../src/surfer.c:795 ../src/surfer.c:798 msgid "Error" msgstr "Erreur" -#: ../src/download.c:303 ../src/download.c:329 +#: ../src/download.c:309 ../src/download.c:335 msgid "kB" msgstr "Kio" -#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 msgid "MB" msgstr "Mo" -#: ../src/download.c:326 +#: ../src/download.c:332 #, c-format msgid "%.1f %s/s" msgstr "%.1f %s/s" -#: ../src/download.c:337 +#: ../src/download.c:343 #, c-format msgid "%.1f %s" msgstr "%.1f %s/s" -#: ../src/download.c:356 +#: ../src/download.c:362 #, c-format msgid "%.1f of %.1f %s" msgstr "%.1f de %.1f %s" -#: ../src/download.c:479 +#: ../src/download.c:485 msgid "Error " msgstr "Erreur " -#: ../src/download.c:504 ../src/download.c:628 +#: ../src/download.c:510 ../src/download.c:634 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:512 ../src/download.c:638 +#: ../src/download.c:518 ../src/download.c:644 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:523 +#: ../src/download.c:529 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:533 +#: ../src/download.c:539 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:541 +#: ../src/download.c:547 msgid "Code " msgstr "Code " -#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:659 +#: ../src/download.c:665 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tfile to write document to\n" diff --git a/po/it.po b/po/it.po index b7f35cf..d26caf8 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-27 16:26+0100\n" +"POT-Creation-Date: 2010-11-27 16:30+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -36,7 +36,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,7 +58,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" @@ -94,63 +94,63 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 -#: ../src/surfer.c:798 +#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 +#: ../src/surfer.c:795 ../src/surfer.c:798 msgid "Error" msgstr "" -#: ../src/download.c:303 ../src/download.c:329 +#: ../src/download.c:309 ../src/download.c:335 msgid "kB" msgstr "" -#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 msgid "MB" msgstr "" -#: ../src/download.c:326 +#: ../src/download.c:332 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:337 +#: ../src/download.c:343 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:356 +#: ../src/download.c:362 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:479 +#: ../src/download.c:485 msgid "Error " msgstr "" -#: ../src/download.c:504 ../src/download.c:628 +#: ../src/download.c:510 ../src/download.c:634 msgid "Complete" msgstr "" -#: ../src/download.c:512 ../src/download.c:638 +#: ../src/download.c:518 ../src/download.c:644 msgid "Downloading" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:529 msgid "Redirected to" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:539 msgid "Resolved" msgstr "" -#: ../src/download.c:541 +#: ../src/download.c:547 msgid "Code " msgstr "" -#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:659 +#: ../src/download.c:665 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tfile to write document to\n" diff --git a/src/download.c b/src/download.c index c235aa5..1aa2bb3 100644 --- a/src/download.c +++ b/src/download.c @@ -286,7 +286,13 @@ static int _download_error(Download * download, char const * message, int ret) dialog = gtk_message_dialog_new(download != NULL ? GTK_WINDOW(download->window) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, "%s: %s", message, strerror(errno)); + GTK_BUTTONS_CLOSE, +#if GTK_CHECK_VERSION(2, 6, 0) + "%s", _("Error")); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), +#endif + "%s: %s", + message, strerror(errno)); gtk_window_set_title(GTK_WINDOW(dialog), _("Error")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);