From c884a076853c8d2dfd483285ccb0ae37274eaf35 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 2 Feb 2011 06:44:03 +0000 Subject: [PATCH] Also displaying the current address in the download dialog --- po/de.po | 62 ++++++++++++++++++++++++--------------------- po/es.po | 62 ++++++++++++++++++++++++--------------------- po/fr.po | 68 ++++++++++++++++++++++++++------------------------ po/it.po | 62 ++++++++++++++++++++++++--------------------- src/download.c | 14 +++++++---- 5 files changed, 144 insertions(+), 124 deletions(-) diff --git a/po/de.po b/po/de.po index 711ef39..821202a 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: 2011-01-29 22:59+0100\n" +"POT-Creation-Date: 2011-02-02 07:37+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:188 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:480 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,111 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:557 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:173 +#: ../src/download.c:174 msgid "Download" msgstr "" -#: ../src/download.c:182 +#: ../src/download.c:183 +msgid "Address: " +msgstr "" + +#: ../src/download.c:185 msgid "File: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "Status: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "Done: " msgstr "" -#: ../src/download.c:187 +#: ../src/download.c:190 msgid "0.0 kB" msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:191 msgid "Speed: " msgstr "" -#: ../src/download.c:189 +#: ../src/download.c:192 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:196 +#: ../src/download.c:199 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 +#: ../src/download.c:294 ../src/download.c:299 ../src/download.c:634 #: ../src/surfer.c:937 ../src/surfer.c:940 msgid "Error" msgstr "Fehler" -#: ../src/download.c:309 ../src/download.c:335 +#: ../src/download.c:312 ../src/download.c:338 msgid "kB" msgstr "" -#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 +#: ../src/download.c:333 ../src/download.c:344 ../src/download.c:363 msgid "MB" msgstr "" -#: ../src/download.c:332 +#: ../src/download.c:335 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:346 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:362 +#: ../src/download.c:365 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:485 +#: ../src/download.c:488 msgid "Error " msgstr "Fehler " -#: ../src/download.c:510 ../src/download.c:642 +#: ../src/download.c:513 ../src/download.c:645 msgid "Complete" msgstr "" -#: ../src/download.c:518 ../src/download.c:650 +#: ../src/download.c:521 ../src/download.c:653 msgid "Downloading" msgstr "" -#: ../src/download.c:529 +#: ../src/download.c:532 msgid "Redirected to" msgstr "" -#: ../src/download.c:532 +#: ../src/download.c:535 msgid "Redirected" msgstr "" -#: ../src/download.c:539 +#: ../src/download.c:542 msgid "Resolved" msgstr "" -#: ../src/download.c:547 +#: ../src/download.c:550 msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 +#: ../src/download.c:608 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 msgid "Unknown error" msgstr "" -#: ../src/download.c:671 +#: ../src/download.c:674 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" -" -O\tfile to write document to\n" -" -U\tuser agent string to send\n" +" -O\tFile to write document to\n" +" -U\tUser-agent string to send\n" msgstr "" #: ../src/ghtml-gtkhtml.c:753 diff --git a/po/es.po b/po/es.po index 4e313b0..98ba22f 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: 2011-01-29 22:59+0100\n" +"POT-Creation-Date: 2011-02-02 07:37+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:188 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:480 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,111 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:557 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:173 +#: ../src/download.c:174 msgid "Download" msgstr "" -#: ../src/download.c:182 +#: ../src/download.c:183 +msgid "Address: " +msgstr "" + +#: ../src/download.c:185 msgid "File: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "Status: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "Done: " msgstr "" -#: ../src/download.c:187 +#: ../src/download.c:190 msgid "0.0 kB" msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:191 msgid "Speed: " msgstr "" -#: ../src/download.c:189 +#: ../src/download.c:192 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:196 +#: ../src/download.c:199 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 +#: ../src/download.c:294 ../src/download.c:299 ../src/download.c:634 #: ../src/surfer.c:937 ../src/surfer.c:940 msgid "Error" msgstr "" -#: ../src/download.c:309 ../src/download.c:335 +#: ../src/download.c:312 ../src/download.c:338 msgid "kB" msgstr "" -#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 +#: ../src/download.c:333 ../src/download.c:344 ../src/download.c:363 msgid "MB" msgstr "" -#: ../src/download.c:332 +#: ../src/download.c:335 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:346 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:362 +#: ../src/download.c:365 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:485 +#: ../src/download.c:488 msgid "Error " msgstr "" -#: ../src/download.c:510 ../src/download.c:642 +#: ../src/download.c:513 ../src/download.c:645 msgid "Complete" msgstr "" -#: ../src/download.c:518 ../src/download.c:650 +#: ../src/download.c:521 ../src/download.c:653 msgid "Downloading" msgstr "" -#: ../src/download.c:529 +#: ../src/download.c:532 msgid "Redirected to" msgstr "" -#: ../src/download.c:532 +#: ../src/download.c:535 msgid "Redirected" msgstr "" -#: ../src/download.c:539 +#: ../src/download.c:542 msgid "Resolved" msgstr "" -#: ../src/download.c:547 +#: ../src/download.c:550 msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 +#: ../src/download.c:608 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 msgid "Unknown error" msgstr "" -#: ../src/download.c:671 +#: ../src/download.c:674 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" -" -O\tfile to write document to\n" -" -U\tuser agent string to send\n" +" -O\tFile to write document to\n" +" -U\tUser-agent string to send\n" msgstr "" #: ../src/ghtml-gtkhtml.c:753 diff --git a/po/fr.po b/po/fr.po index 72a1ab7..6f941f4 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: 2011-01-29 22:59+0100\n" +"POT-Creation-Date: 2011-02-02 07:36+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -65,11 +65,11 @@ msgstr "Port :" msgid "Network" msgstr "Réseau" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:188 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:480 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "Connecté" @@ -91,111 +91,115 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:557 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "Délai dépassé" -#: ../src/download.c:173 +#: ../src/download.c:174 msgid "Download" msgstr "Téléchargement" -#: ../src/download.c:182 +#: ../src/download.c:183 +msgid "Address: " +msgstr "Adresse: " + +#: ../src/download.c:185 msgid "File: " msgstr "Fichier : " -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "Status: " msgstr "Statut : " -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "Done: " msgstr "Fait : " -#: ../src/download.c:187 +#: ../src/download.c:190 msgid "0.0 kB" msgstr "0.0 Kio" -#: ../src/download.c:188 +#: ../src/download.c:191 msgid "Speed: " msgstr "Vitesse : " -#: ../src/download.c:189 +#: ../src/download.c:192 msgid "0.0 kB/s" msgstr "0.0 Kio/s" -#: ../src/download.c:196 +#: ../src/download.c:199 msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" -#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 +#: ../src/download.c:294 ../src/download.c:299 ../src/download.c:634 #: ../src/surfer.c:937 ../src/surfer.c:940 msgid "Error" msgstr "Erreur" -#: ../src/download.c:309 ../src/download.c:335 +#: ../src/download.c:312 ../src/download.c:338 msgid "kB" msgstr "Kio" -#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 +#: ../src/download.c:333 ../src/download.c:344 ../src/download.c:363 msgid "MB" msgstr "Mo" -#: ../src/download.c:332 +#: ../src/download.c:335 #, c-format msgid "%.1f %s/s" msgstr "%.1f %s/s" -#: ../src/download.c:343 +#: ../src/download.c:346 #, c-format msgid "%.1f %s" msgstr "%.1f %s/s" -#: ../src/download.c:362 +#: ../src/download.c:365 #, c-format msgid "%.1f of %.1f %s" msgstr "%.1f de %.1f %s" -#: ../src/download.c:485 +#: ../src/download.c:488 msgid "Error " msgstr "Erreur " -#: ../src/download.c:510 ../src/download.c:642 +#: ../src/download.c:513 ../src/download.c:645 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:518 ../src/download.c:650 +#: ../src/download.c:521 ../src/download.c:653 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:529 +#: ../src/download.c:532 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:532 +#: ../src/download.c:535 msgid "Redirected" msgstr "Redirigé" -#: ../src/download.c:539 +#: ../src/download.c:542 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:547 +#: ../src/download.c:550 msgid "Code " msgstr "Code " -#: ../src/download.c:605 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 +#: ../src/download.c:608 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:671 +#: ../src/download.c:674 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" -" -O\tfile to write document to\n" -" -U\tuser agent string to send\n" +" -O\tFile to write document to\n" +" -U\tUser-agent string to send\n" msgstr "" -"Usage: download [-O sortie][-U user-agent] URL...\n" -" -O\tfichier de destination\n" -" -U\tuser-agent à utiliser\n" +"Usage: download [-O fichier][-U user-agent] URL...\n" +" -O\tFichier de destination\n" +" -U\tUser-agent à utiliser\n" #: ../src/ghtml-gtkhtml.c:753 msgid "Unknown protocol" diff --git a/po/it.po b/po/it.po index 92dce3f..685ac1b 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: 2011-01-29 22:59+0100\n" +"POT-Creation-Date: 2011-02-02 07:37+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:188 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:480 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,107 +89,111 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:557 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" -#: ../src/download.c:173 +#: ../src/download.c:174 msgid "Download" msgstr "" -#: ../src/download.c:182 +#: ../src/download.c:183 +msgid "Address: " +msgstr "" + +#: ../src/download.c:185 msgid "File: " msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:187 msgid "Status: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:189 msgid "Done: " msgstr "" -#: ../src/download.c:187 +#: ../src/download.c:190 msgid "0.0 kB" msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:191 msgid "Speed: " msgstr "" -#: ../src/download.c:189 +#: ../src/download.c:192 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:196 +#: ../src/download.c:199 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 +#: ../src/download.c:294 ../src/download.c:299 ../src/download.c:634 #: ../src/surfer.c:937 ../src/surfer.c:940 msgid "Error" msgstr "" -#: ../src/download.c:309 ../src/download.c:335 +#: ../src/download.c:312 ../src/download.c:338 msgid "kB" msgstr "" -#: ../src/download.c:330 ../src/download.c:341 ../src/download.c:360 +#: ../src/download.c:333 ../src/download.c:344 ../src/download.c:363 msgid "MB" msgstr "" -#: ../src/download.c:332 +#: ../src/download.c:335 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:343 +#: ../src/download.c:346 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:362 +#: ../src/download.c:365 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:485 +#: ../src/download.c:488 msgid "Error " msgstr "" -#: ../src/download.c:510 ../src/download.c:642 +#: ../src/download.c:513 ../src/download.c:645 msgid "Complete" msgstr "" -#: ../src/download.c:518 ../src/download.c:650 +#: ../src/download.c:521 ../src/download.c:653 msgid "Downloading" msgstr "" -#: ../src/download.c:529 +#: ../src/download.c:532 msgid "Redirected to" msgstr "" -#: ../src/download.c:532 +#: ../src/download.c:535 msgid "Redirected" msgstr "" -#: ../src/download.c:539 +#: ../src/download.c:542 msgid "Resolved" msgstr "" -#: ../src/download.c:547 +#: ../src/download.c:550 msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 +#: ../src/download.c:608 ../src/ghtml-webkit.c:673 ../src/surfer.c:939 msgid "Unknown error" msgstr "" -#: ../src/download.c:671 +#: ../src/download.c:674 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" -" -O\tfile to write document to\n" -" -U\tuser agent string to send\n" +" -O\tFile to write document to\n" +" -U\tUser-agent string to send\n" msgstr "" #: ../src/ghtml-gtkhtml.c:753 diff --git a/src/download.c b/src/download.c index 3e4153f..c8bad3e 100644 --- a/src/download.c +++ b/src/download.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2010 Pierre Pronchery */ +/* Copyright (c) 2011 Pierre Pronchery */ /* This file is part of DeforaOS Desktop Surfer */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,6 +72,8 @@ struct _Download /* widgets */ GtkWidget * window; + GtkWidget * address; + GtkWidget * filename; GtkWidget * status; GtkWidget * done; GtkWidget * speed; @@ -179,8 +181,10 @@ Download * download_new(DownloadPrefs * prefs, char const * url) pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); right = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - _download_label(vbox, bold, left, right, _("File: "), &download->status, - prefs->output); + _download_label(vbox, bold, left, right, _("Address: "), + &download->address, url); + _download_label(vbox, bold, left, right, _("File: "), + &download->filename, download->prefs.output); _download_label(vbox, bold, left, right, _("Status: "), &download->status, _("Resolving...")); _download_label(vbox, bold, left, right, _("Done: "), &download->done, @@ -669,8 +673,8 @@ static gboolean _download_on_timeout(gpointer data) static int _usage(void) { fputs(_("Usage: download [-O output][-U user-agent] URL...\n" -" -O file to write document to\n" -" -U user agent string to send\n"), stderr); +" -O File to write document to\n" +" -U User-agent string to send\n"), stderr); return 1; }