From 39dd3824864f9ca1d59569a58bcf5a2ff52cc755 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 27 Nov 2010 15:28:03 +0000 Subject: [PATCH] The download dialog switches to MB (megabytes) when relevant --- po/de.po | 66 +++++++++++++++++++++++------------------- po/es.po | 66 +++++++++++++++++++++++------------------- po/fr.po | 78 ++++++++++++++++++++++++++++---------------------- po/it.po | 66 +++++++++++++++++++++++------------------- src/download.c | 32 ++++++++++++++++----- 5 files changed, 179 insertions(+), 129 deletions(-) diff --git a/po/de.po b/po/de.po index b5233cf..bb6585b 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-16 18:33+0100\n" +"POT-Creation-Date: 2010-11-27 16:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -32,11 +32,11 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:182 ../src/ghtml-gtkhtml.c:831 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:453 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,91 +58,99 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:530 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" -#: ../src/download.c:170 +#: ../src/download.c:173 msgid "Download" msgstr "" -#: ../src/download.c:179 +#: ../src/download.c:182 msgid "File: " msgstr "" -#: ../src/download.c:181 +#: ../src/download.c:184 msgid "Status: " msgstr "" -#: ../src/download.c:183 +#: ../src/download.c:186 msgid "Done: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "0.0 kB" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:188 msgid "Speed: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:196 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:287 ../src/download.c:599 ../src/surfer.c:795 +#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 #: ../src/surfer.c:798 msgid "Error" msgstr "Fehler" -#: ../src/download.c:318 -#, c-format -msgid "%.1f kB/s" +#: ../src/download.c:303 ../src/download.c:329 +msgid "kB" msgstr "" -#: ../src/download.c:324 -#, c-format -msgid "%.1f kB" +#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +msgid "MB" msgstr "" -#: ../src/download.c:338 +#: ../src/download.c:326 #, c-format -msgid "%.1f of %.1f kB" +msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:461 +#: ../src/download.c:337 +#, c-format +msgid "%.1f %s" +msgstr "" + +#: ../src/download.c:356 +#, c-format +msgid "%.1f of %.1f %s" +msgstr "" + +#: ../src/download.c:479 msgid "Error " msgstr "Fehler " -#: ../src/download.c:486 ../src/download.c:610 +#: ../src/download.c:504 ../src/download.c:628 msgid "Complete" msgstr "" -#: ../src/download.c:494 ../src/download.c:620 +#: ../src/download.c:512 ../src/download.c:638 msgid "Downloading" msgstr "" -#: ../src/download.c:505 +#: ../src/download.c:523 msgid "Redirected to" msgstr "" -#: ../src/download.c:515 +#: ../src/download.c:533 msgid "Resolved" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:541 msgid "Code " msgstr "" -#: ../src/download.c:573 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:641 +#: ../src/download.c:659 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 17c2d8f..3a7508e 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-16 18:33+0100\n" +"POT-Creation-Date: 2010-11-27 16:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -32,11 +32,11 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:182 ../src/ghtml-gtkhtml.c:831 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:453 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,91 +58,99 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:530 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" -#: ../src/download.c:170 +#: ../src/download.c:173 msgid "Download" msgstr "" -#: ../src/download.c:179 +#: ../src/download.c:182 msgid "File: " msgstr "" -#: ../src/download.c:181 +#: ../src/download.c:184 msgid "Status: " msgstr "" -#: ../src/download.c:183 +#: ../src/download.c:186 msgid "Done: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "0.0 kB" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:188 msgid "Speed: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:196 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:287 ../src/download.c:599 ../src/surfer.c:795 +#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 #: ../src/surfer.c:798 msgid "Error" msgstr "" -#: ../src/download.c:318 -#, c-format -msgid "%.1f kB/s" +#: ../src/download.c:303 ../src/download.c:329 +msgid "kB" msgstr "" -#: ../src/download.c:324 -#, c-format -msgid "%.1f kB" +#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +msgid "MB" msgstr "" -#: ../src/download.c:338 +#: ../src/download.c:326 #, c-format -msgid "%.1f of %.1f kB" +msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:461 +#: ../src/download.c:337 +#, c-format +msgid "%.1f %s" +msgstr "" + +#: ../src/download.c:356 +#, c-format +msgid "%.1f of %.1f %s" +msgstr "" + +#: ../src/download.c:479 msgid "Error " msgstr "" -#: ../src/download.c:486 ../src/download.c:610 +#: ../src/download.c:504 ../src/download.c:628 msgid "Complete" msgstr "" -#: ../src/download.c:494 ../src/download.c:620 +#: ../src/download.c:512 ../src/download.c:638 msgid "Downloading" msgstr "" -#: ../src/download.c:505 +#: ../src/download.c:523 msgid "Redirected to" msgstr "" -#: ../src/download.c:515 +#: ../src/download.c:533 msgid "Resolved" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:541 msgid "Code " msgstr "" -#: ../src/download.c:573 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:641 +#: ../src/download.c:659 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 7af7c99..c718777 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-16 18:33+0100\n" +"POT-Creation-Date: 2010-11-27 16:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -32,11 +32,11 @@ msgstr "Focaliser les nouveaux onglets" msgid "General" msgstr "Général" -#: ../src/common/conn.c:204 ../src/download.c:182 ../src/ghtml-gtkhtml.c:831 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:453 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "Connecté" @@ -58,91 +58,99 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:530 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "Délai dépassé" -#: ../src/download.c:170 +#: ../src/download.c:173 msgid "Download" msgstr "Téléchargement" -#: ../src/download.c:179 +#: ../src/download.c:182 msgid "File: " msgstr "Fichier : " -#: ../src/download.c:181 +#: ../src/download.c:184 msgid "Status: " msgstr "Statut : " -#: ../src/download.c:183 +#: ../src/download.c:186 msgid "Done: " msgstr "Fait : " -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "0.0 kB" msgstr "0.0 Kio" -#: ../src/download.c:185 +#: ../src/download.c:188 msgid "Speed: " msgstr "Vitesse : " -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "0.0 kB/s" msgstr "0.0 Kio/s" -#: ../src/download.c:193 +#: ../src/download.c:196 msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" -#: ../src/download.c:287 ../src/download.c:599 ../src/surfer.c:795 +#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 #: ../src/surfer.c:798 msgid "Error" msgstr "Erreur" -#: ../src/download.c:318 -#, c-format -msgid "%.1f kB/s" -msgstr "%.1f Kio/s" +#: ../src/download.c:303 ../src/download.c:329 +msgid "kB" +msgstr "Kio" -#: ../src/download.c:324 -#, c-format -msgid "%.1f kB" -msgstr "%.1f Kio" +#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +msgid "MB" +msgstr "Mo" -#: ../src/download.c:338 +#: ../src/download.c:326 #, c-format -msgid "%.1f of %.1f kB" -msgstr "%.1f de %.1f Kio" +msgid "%.1f %s/s" +msgstr "%.1f %s/s" -#: ../src/download.c:461 +#: ../src/download.c:337 +#, c-format +msgid "%.1f %s" +msgstr "%.1f %s/s" + +#: ../src/download.c:356 +#, c-format +msgid "%.1f of %.1f %s" +msgstr "%.1f de %.1f %s" + +#: ../src/download.c:479 msgid "Error " msgstr "Erreur " -#: ../src/download.c:486 ../src/download.c:610 +#: ../src/download.c:504 ../src/download.c:628 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:494 ../src/download.c:620 +#: ../src/download.c:512 ../src/download.c:638 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:505 +#: ../src/download.c:523 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:515 +#: ../src/download.c:533 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:523 +#: ../src/download.c:541 msgid "Code " msgstr "Code " -#: ../src/download.c:573 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:641 +#: ../src/download.c:659 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tfile to write document to\n" @@ -295,11 +303,11 @@ msgstr "_Aide" #: ../src/surfer.c:196 msgid "Back" -msgstr "" +msgstr "Précédent" #: ../src/surfer.c:198 msgid "Forward" -msgstr "" +msgstr "Suivant" #: ../src/surfer.c:200 msgid "Stop" @@ -397,4 +405,4 @@ msgstr "Avertissement" #: ../src/surfer.c:1446 msgid "This file already exists. Overwrite?" -msgstr "" +msgstr "Le fichier existe déjà. L'écraser ?" diff --git a/po/it.po b/po/it.po index 2406304..b7f35cf 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-16 18:33+0100\n" +"POT-Creation-Date: 2010-11-27 16:26+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -32,11 +32,11 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:182 ../src/ghtml-gtkhtml.c:831 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:453 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:471 ../src/ghtml-gtkhtml.c:881 msgid "Connected" msgstr "" @@ -58,91 +58,99 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:530 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:548 ../src/ghtml-gtkhtml.c:1067 msgid "Timeout" msgstr "" -#: ../src/download.c:170 +#: ../src/download.c:173 msgid "Download" msgstr "" -#: ../src/download.c:179 +#: ../src/download.c:182 msgid "File: " msgstr "" -#: ../src/download.c:181 +#: ../src/download.c:184 msgid "Status: " msgstr "" -#: ../src/download.c:183 +#: ../src/download.c:186 msgid "Done: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "0.0 kB" msgstr "" -#: ../src/download.c:185 +#: ../src/download.c:188 msgid "Speed: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:196 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:287 ../src/download.c:599 ../src/surfer.c:795 +#: ../src/download.c:290 ../src/download.c:617 ../src/surfer.c:795 #: ../src/surfer.c:798 msgid "Error" msgstr "" -#: ../src/download.c:318 -#, c-format -msgid "%.1f kB/s" +#: ../src/download.c:303 ../src/download.c:329 +msgid "kB" msgstr "" -#: ../src/download.c:324 -#, c-format -msgid "%.1f kB" +#: ../src/download.c:324 ../src/download.c:335 ../src/download.c:354 +msgid "MB" msgstr "" -#: ../src/download.c:338 +#: ../src/download.c:326 #, c-format -msgid "%.1f of %.1f kB" +msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:461 +#: ../src/download.c:337 +#, c-format +msgid "%.1f %s" +msgstr "" + +#: ../src/download.c:356 +#, c-format +msgid "%.1f of %.1f %s" +msgstr "" + +#: ../src/download.c:479 msgid "Error " msgstr "" -#: ../src/download.c:486 ../src/download.c:610 +#: ../src/download.c:504 ../src/download.c:628 msgid "Complete" msgstr "" -#: ../src/download.c:494 ../src/download.c:620 +#: ../src/download.c:512 ../src/download.c:638 msgid "Downloading" msgstr "" -#: ../src/download.c:505 +#: ../src/download.c:523 msgid "Redirected to" msgstr "" -#: ../src/download.c:515 +#: ../src/download.c:533 msgid "Resolved" msgstr "" -#: ../src/download.c:523 +#: ../src/download.c:541 msgid "Code " msgstr "" -#: ../src/download.c:573 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:591 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 msgid "Unknown error" msgstr "" -#: ../src/download.c:641 +#: ../src/download.c:659 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 33534b4..c235aa5 100644 --- a/src/download.c +++ b/src/download.c @@ -12,6 +12,8 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +/* TODO: + * - let the checkbox to close window be a global option */ @@ -34,6 +36,7 @@ #include "download.h" #include "../config.h" #define _(string) gettext(string) +#define N_(string) (string) /* constants */ @@ -297,6 +300,7 @@ static void _download_refresh(Download * download) char buf[256]; /* FIXME convert to UTF-8 */ struct timeval tv; double rate; + char const * unit = N_("kB"); double fraction; #ifdef DEBUG @@ -314,14 +318,23 @@ static void _download_refresh(Download * download) tv.tv_usec += 1000000; } rate = (tv.tv_sec * 1000) + (tv.tv_usec / 1000); - rate = download->data_received / rate; - snprintf(buf, sizeof(buf), _("%.1f kB/s"), rate); + if((rate = download->data_received / rate) > 1024) + { + rate /= 1024; + unit = N_("MB"); + } + snprintf(buf, sizeof(buf), _("%.1f %s/s"), rate, _(unit)); gtk_label_set_text(GTK_LABEL(download->speed), buf); } + unit = N_("kB"); if(download->content_length == 0) { - rate = download->data_received / 1024; - snprintf(buf, sizeof(buf), _("%.1f kB"), rate); + if((rate = download->data_received / 1024) > 1024) + { + rate /= 1024; + unit = N_("MB"); + } + snprintf(buf, sizeof(buf), _("%.1f %s"), rate, _(unit)); gtk_label_set_text(GTK_LABEL(download->done), buf); buf[0] = '\0'; if(download->pulse != 0) @@ -334,9 +347,14 @@ static void _download_refresh(Download * download) else { rate = download->data_received / 1024; - fraction = download->content_length / 1024; - snprintf(buf, sizeof(buf), _("%.1f of %.1f kB"), rate, - fraction); + if((fraction = download->content_length / 1024) > 1024) + { + rate /= 1024; + fraction /= 1024; + unit = N_("MB"); + } + snprintf(buf, sizeof(buf), _("%.1f of %.1f %s"), rate, + fraction, _(unit)); gtk_label_set_text(GTK_LABEL(download->done), buf); fraction = (double)download->data_received / (double)download->content_length;