From b32a5ae3d70d5a323b041d5949717a861cf7b390 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 11 Jun 2011 16:36:15 +0000 Subject: [PATCH] Added a configuration value to automatically close downloads once completed --- po/de.po | 196 +++++++++++++++++++++++++------------------------ po/es.po | 196 +++++++++++++++++++++++++------------------------ po/fr.po | 196 +++++++++++++++++++++++++------------------------ po/it.po | 196 +++++++++++++++++++++++++------------------------ src/common.h | 2 + src/download.c | 7 ++ src/download.h | 4 +- src/surfer.c | 31 ++++++-- 8 files changed, 436 insertions(+), 392 deletions(-) diff --git a/po/de.po b/po/de.po index aaa8fe5..42167b3 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-05-27 13:46+0200\n" +"POT-Creation-Date: 2011-06-11 18:34+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 -#: ../src/surfer.c:823 ../src/surfer.c:1280 ../src/surfer.c:1284 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:824 +#: ../src/surfer.c:827 ../src/surfer.c:1288 ../src/surfer.c:1292 msgid "Question" msgstr "" @@ -31,7 +31,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:566 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:573 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:645 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:652 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -93,67 +93,67 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:328 ../src/download.c:333 ../src/download.c:722 -#: ../src/surfer.c:971 ../src/surfer.c:974 +#: ../src/download.c:335 ../src/download.c:340 ../src/download.c:729 +#: ../src/surfer.c:979 ../src/surfer.c:982 msgid "Error" msgstr "Fehler" -#: ../src/download.c:382 ../src/download.c:408 +#: ../src/download.c:389 ../src/download.c:415 msgid "kB" msgstr "" -#: ../src/download.c:403 ../src/download.c:414 ../src/download.c:433 +#: ../src/download.c:410 ../src/download.c:421 ../src/download.c:440 msgid "MB" msgstr "" -#: ../src/download.c:405 +#: ../src/download.c:412 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:416 +#: ../src/download.c:423 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:435 +#: ../src/download.c:442 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:574 +#: ../src/download.c:581 msgid "Error " msgstr "Fehler " -#: ../src/download.c:599 ../src/download.c:727 +#: ../src/download.c:606 ../src/download.c:734 msgid "Complete" msgstr "" -#: ../src/download.c:609 ../src/download.c:745 +#: ../src/download.c:616 ../src/download.c:752 msgid "Downloading" msgstr "" -#: ../src/download.c:620 +#: ../src/download.c:627 msgid "Redirected to" msgstr "" -#: ../src/download.c:623 +#: ../src/download.c:630 msgid "Redirected" msgstr "" -#: ../src/download.c:630 +#: ../src/download.c:637 msgid "Resolved" msgstr "" -#: ../src/download.c:638 +#: ../src/download.c:645 msgid "Code " msgstr "" -#: ../src/download.c:696 ../src/ghtml-webkit.c:695 ../src/surfer.c:973 +#: ../src/download.c:703 ../src/ghtml-webkit.c:695 ../src/surfer.c:981 msgid "Unknown error" msgstr "" -#: ../src/download.c:766 +#: ../src/download.c:773 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -193,155 +193,155 @@ msgstr "" msgid "Usage: surfer [URL...]\n" msgstr "Usage: surfer [URL...]\n" -#: ../src/surfer.c:107 +#: ../src/surfer.c:106 msgid "_New tab" msgstr "" -#: ../src/surfer.c:109 +#: ../src/surfer.c:108 msgid "_New window" msgstr "_Neue Fenster" -#: ../src/surfer.c:111 +#: ../src/surfer.c:110 msgid "_Open..." msgstr "_Offnen..." -#: ../src/surfer.c:113 +#: ../src/surfer.c:112 msgid "Open _URL..." msgstr "" -#: ../src/surfer.c:116 +#: ../src/surfer.c:115 msgid "Save _as..." msgstr "" -#: ../src/surfer.c:119 +#: ../src/surfer.c:118 msgid "_Print..." msgstr "" -#: ../src/surfer.c:122 +#: ../src/surfer.c:121 msgid "Close _tab" msgstr "" -#: ../src/surfer.c:124 +#: ../src/surfer.c:123 msgid "_Close" msgstr "_Schliessen" -#: ../src/surfer.c:131 +#: ../src/surfer.c:130 msgid "_Undo" msgstr "" -#: ../src/surfer.c:133 +#: ../src/surfer.c:132 msgid "_Redo" msgstr "" -#: ../src/surfer.c:136 +#: ../src/surfer.c:135 msgid "_Cut" msgstr "" -#: ../src/surfer.c:138 +#: ../src/surfer.c:137 msgid "Cop_y" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:139 msgid "_Paste" msgstr "" -#: ../src/surfer.c:143 +#: ../src/surfer.c:142 msgid "Select _all" msgstr "" -#: ../src/surfer.c:150 +#: ../src/surfer.c:149 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:152 +#: ../src/surfer.c:151 msgid "_Find" msgstr "_Suchen" -#: ../src/surfer.c:155 +#: ../src/surfer.c:154 msgid "_Preferences" msgstr "_Einstellungen" -#: ../src/surfer.c:162 ../src/surfer.c:220 +#: ../src/surfer.c:161 ../src/surfer.c:219 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:164 ../src/surfer.c:221 +#: ../src/surfer.c:163 ../src/surfer.c:220 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:166 ../src/surfer.c:222 +#: ../src/surfer.c:165 ../src/surfer.c:221 msgid "Normal size" msgstr "" -#: ../src/surfer.c:169 +#: ../src/surfer.c:168 msgid "_Fullscreen" msgstr "" -#: ../src/surfer.c:172 +#: ../src/surfer.c:171 msgid "_Refresh" msgstr "_Aktualisieren" -#: ../src/surfer.c:174 +#: ../src/surfer.c:173 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:176 +#: ../src/surfer.c:175 msgid "_Stop" msgstr "" -#: ../src/surfer.c:179 +#: ../src/surfer.c:178 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:181 +#: ../src/surfer.c:180 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:187 msgid "_About" msgstr "_Info" -#: ../src/surfer.c:199 +#: ../src/surfer.c:198 msgid "_File" msgstr "_Datei" -#: ../src/surfer.c:200 +#: ../src/surfer.c:199 msgid "_Edit" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:200 msgid "_View" msgstr "" -#: ../src/surfer.c:202 +#: ../src/surfer.c:201 msgid "_Help" msgstr "_Hilfe" -#: ../src/surfer.c:209 +#: ../src/surfer.c:208 msgid "Back" msgstr "Zurück" -#: ../src/surfer.c:211 +#: ../src/surfer.c:210 msgid "Forward" msgstr "" -#: ../src/surfer.c:213 +#: ../src/surfer.c:212 msgid "Stop" msgstr "" -#: ../src/surfer.c:214 +#: ../src/surfer.c:213 msgid "Refresh" msgstr "Aktualisieren" -#: ../src/surfer.c:217 +#: ../src/surfer.c:216 msgid "Home" msgstr "" -#: ../src/surfer.c:225 +#: ../src/surfer.c:224 msgid "New tab" msgstr "" -#: ../src/surfer.c:227 +#: ../src/surfer.c:226 msgid "New window" msgstr "" @@ -353,7 +353,7 @@ msgstr "Web surfer" msgid " Location: " msgstr "" -#: ../src/surfer.c:396 ../src/surfer.c:1790 ../src/surfer.c:1794 +#: ../src/surfer.c:396 ../src/surfer.c:1807 ../src/surfer.c:1811 msgid "Security information" msgstr "" @@ -361,143 +361,147 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:676 ../src/surfer.c:1196 +#: ../src/surfer.c:676 ../src/surfer.c:1204 msgid "Untitled" msgstr "" -#: ../src/surfer.c:921 ../src/surfer.c:1362 +#: ../src/surfer.c:926 ../src/surfer.c:1370 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:1002 +#: ../src/surfer.c:1010 msgid "Find text" msgstr "Text suchen" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1022 msgid "Text:" msgstr "Text:" -#: ../src/surfer.c:1022 +#: ../src/surfer.c:1030 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1026 +#: ../src/surfer.c:1034 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1029 +#: ../src/surfer.c:1037 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1059 +#: ../src/surfer.c:1067 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1148 +#: ../src/surfer.c:1156 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1186 +#: ../src/surfer.c:1194 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1423 +#: ../src/surfer.c:1431 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1436 msgid "Command:" msgstr "" -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1455 msgid "Message" msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1460 msgid "Source" msgstr "" -#: ../src/surfer.c:1457 +#: ../src/surfer.c:1465 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1589 +#: ../src/surfer.c:1597 msgid "Web surfer preferences" msgstr "Web surfer Einstellungen" -#: ../src/surfer.c:1609 +#: ../src/surfer.c:1617 msgid "Homepage:" msgstr "Hauptseite:" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1623 msgid "Tab handling" msgstr "" -#: ../src/surfer.c:1620 +#: ../src/surfer.c:1628 msgid "Focus new tabs" msgstr "" -#: ../src/surfer.c:1625 +#: ../src/surfer.c:1633 msgid "Downloads" msgstr "" -#: ../src/surfer.c:1628 +#: ../src/surfer.c:1636 msgid "Default download directory:" msgstr "" -#: ../src/surfer.c:1632 +#: ../src/surfer.c:1640 msgid "Choose the default download directory" msgstr "" -#: ../src/surfer.c:1639 +#: ../src/surfer.c:1645 +msgid "Close download windows when complete" +msgstr "" + +#: ../src/surfer.c:1651 msgid "General" msgstr "Allgemein" -#: ../src/surfer.c:1643 +#: ../src/surfer.c:1655 msgid "Connectivity:" msgstr "" -#: ../src/surfer.c:1646 +#: ../src/surfer.c:1658 msgid "Direct connection" msgstr "Direkt Verbindung" -#: ../src/surfer.c:1650 +#: ../src/surfer.c:1662 msgid "HTTP proxy:" msgstr "HTTP proxy:" -#: ../src/surfer.c:1657 +#: ../src/surfer.c:1669 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1661 +#: ../src/surfer.c:1673 msgid "Port:" msgstr "Port:" -#: ../src/surfer.c:1671 +#: ../src/surfer.c:1683 msgid "Network" msgstr "Netzwerk" -#: ../src/surfer.c:1776 +#: ../src/surfer.c:1793 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1779 +#: ../src/surfer.c:1796 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1783 +#: ../src/surfer.c:1800 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1838 +#: ../src/surfer.c:1855 msgid "Web surfer - Source of " msgstr "Web surfer - Quellcode von " -#: ../src/surfer.c:1880 ../src/surfer.c:1883 ../src/surfer.c:1938 -#: ../src/surfer.c:1943 +#: ../src/surfer.c:1897 ../src/surfer.c:1900 ../src/surfer.c:1955 +#: ../src/surfer.c:1960 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1942 +#: ../src/surfer.c:1959 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index f635e85..7a78068 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-05-27 13:46+0200\n" +"POT-Creation-Date: 2011-06-11 18:34+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 -#: ../src/surfer.c:823 ../src/surfer.c:1280 ../src/surfer.c:1284 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:824 +#: ../src/surfer.c:827 ../src/surfer.c:1288 ../src/surfer.c:1292 msgid "Question" msgstr "" @@ -31,7 +31,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:566 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:573 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:645 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:652 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -93,67 +93,67 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:328 ../src/download.c:333 ../src/download.c:722 -#: ../src/surfer.c:971 ../src/surfer.c:974 +#: ../src/download.c:335 ../src/download.c:340 ../src/download.c:729 +#: ../src/surfer.c:979 ../src/surfer.c:982 msgid "Error" msgstr "" -#: ../src/download.c:382 ../src/download.c:408 +#: ../src/download.c:389 ../src/download.c:415 msgid "kB" msgstr "" -#: ../src/download.c:403 ../src/download.c:414 ../src/download.c:433 +#: ../src/download.c:410 ../src/download.c:421 ../src/download.c:440 msgid "MB" msgstr "" -#: ../src/download.c:405 +#: ../src/download.c:412 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:416 +#: ../src/download.c:423 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:435 +#: ../src/download.c:442 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:574 +#: ../src/download.c:581 msgid "Error " msgstr "" -#: ../src/download.c:599 ../src/download.c:727 +#: ../src/download.c:606 ../src/download.c:734 msgid "Complete" msgstr "" -#: ../src/download.c:609 ../src/download.c:745 +#: ../src/download.c:616 ../src/download.c:752 msgid "Downloading" msgstr "" -#: ../src/download.c:620 +#: ../src/download.c:627 msgid "Redirected to" msgstr "" -#: ../src/download.c:623 +#: ../src/download.c:630 msgid "Redirected" msgstr "" -#: ../src/download.c:630 +#: ../src/download.c:637 msgid "Resolved" msgstr "" -#: ../src/download.c:638 +#: ../src/download.c:645 msgid "Code " msgstr "" -#: ../src/download.c:696 ../src/ghtml-webkit.c:695 ../src/surfer.c:973 +#: ../src/download.c:703 ../src/ghtml-webkit.c:695 ../src/surfer.c:981 msgid "Unknown error" msgstr "" -#: ../src/download.c:766 +#: ../src/download.c:773 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -193,155 +193,155 @@ msgstr "" msgid "Usage: surfer [URL...]\n" msgstr "Usage: surfer [URL...]\n" -#: ../src/surfer.c:107 +#: ../src/surfer.c:106 msgid "_New tab" msgstr "" -#: ../src/surfer.c:109 +#: ../src/surfer.c:108 msgid "_New window" msgstr "" -#: ../src/surfer.c:111 +#: ../src/surfer.c:110 msgid "_Open..." msgstr "_Abrir..." -#: ../src/surfer.c:113 +#: ../src/surfer.c:112 msgid "Open _URL..." msgstr "Abrir _URL..." -#: ../src/surfer.c:116 +#: ../src/surfer.c:115 msgid "Save _as..." msgstr "Guardar _como..." -#: ../src/surfer.c:119 +#: ../src/surfer.c:118 msgid "_Print..." msgstr "" -#: ../src/surfer.c:122 +#: ../src/surfer.c:121 msgid "Close _tab" msgstr "" -#: ../src/surfer.c:124 +#: ../src/surfer.c:123 msgid "_Close" msgstr "" -#: ../src/surfer.c:131 +#: ../src/surfer.c:130 msgid "_Undo" msgstr "" -#: ../src/surfer.c:133 +#: ../src/surfer.c:132 msgid "_Redo" msgstr "" -#: ../src/surfer.c:136 +#: ../src/surfer.c:135 msgid "_Cut" msgstr "" -#: ../src/surfer.c:138 +#: ../src/surfer.c:137 msgid "Cop_y" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:139 msgid "_Paste" msgstr "" -#: ../src/surfer.c:143 +#: ../src/surfer.c:142 msgid "Select _all" msgstr "" -#: ../src/surfer.c:150 +#: ../src/surfer.c:149 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:152 +#: ../src/surfer.c:151 msgid "_Find" msgstr "" -#: ../src/surfer.c:155 +#: ../src/surfer.c:154 msgid "_Preferences" msgstr "" -#: ../src/surfer.c:162 ../src/surfer.c:220 +#: ../src/surfer.c:161 ../src/surfer.c:219 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:164 ../src/surfer.c:221 +#: ../src/surfer.c:163 ../src/surfer.c:220 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:166 ../src/surfer.c:222 +#: ../src/surfer.c:165 ../src/surfer.c:221 msgid "Normal size" msgstr "" -#: ../src/surfer.c:169 +#: ../src/surfer.c:168 msgid "_Fullscreen" msgstr "" -#: ../src/surfer.c:172 +#: ../src/surfer.c:171 msgid "_Refresh" msgstr "" -#: ../src/surfer.c:174 +#: ../src/surfer.c:173 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:176 +#: ../src/surfer.c:175 msgid "_Stop" msgstr "" -#: ../src/surfer.c:179 +#: ../src/surfer.c:178 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:181 +#: ../src/surfer.c:180 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:187 msgid "_About" msgstr "" -#: ../src/surfer.c:199 +#: ../src/surfer.c:198 msgid "_File" msgstr "" -#: ../src/surfer.c:200 +#: ../src/surfer.c:199 msgid "_Edit" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:200 msgid "_View" msgstr "" -#: ../src/surfer.c:202 +#: ../src/surfer.c:201 msgid "_Help" msgstr "" -#: ../src/surfer.c:209 +#: ../src/surfer.c:208 msgid "Back" msgstr "" -#: ../src/surfer.c:211 +#: ../src/surfer.c:210 msgid "Forward" msgstr "" -#: ../src/surfer.c:213 +#: ../src/surfer.c:212 msgid "Stop" msgstr "" -#: ../src/surfer.c:214 +#: ../src/surfer.c:213 msgid "Refresh" msgstr "" -#: ../src/surfer.c:217 +#: ../src/surfer.c:216 msgid "Home" msgstr "" -#: ../src/surfer.c:225 +#: ../src/surfer.c:224 msgid "New tab" msgstr "" -#: ../src/surfer.c:227 +#: ../src/surfer.c:226 msgid "New window" msgstr "" @@ -353,7 +353,7 @@ msgstr "Web surfer" msgid " Location: " msgstr "" -#: ../src/surfer.c:396 ../src/surfer.c:1790 ../src/surfer.c:1794 +#: ../src/surfer.c:396 ../src/surfer.c:1807 ../src/surfer.c:1811 msgid "Security information" msgstr "" @@ -361,143 +361,147 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:676 ../src/surfer.c:1196 +#: ../src/surfer.c:676 ../src/surfer.c:1204 msgid "Untitled" msgstr "" -#: ../src/surfer.c:921 ../src/surfer.c:1362 +#: ../src/surfer.c:926 ../src/surfer.c:1370 msgid "Save file as..." msgstr "Guardar como..." -#: ../src/surfer.c:1002 +#: ../src/surfer.c:1010 msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1022 msgid "Text:" msgstr "" -#: ../src/surfer.c:1022 +#: ../src/surfer.c:1030 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1026 +#: ../src/surfer.c:1034 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1029 +#: ../src/surfer.c:1037 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1059 +#: ../src/surfer.c:1067 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1148 +#: ../src/surfer.c:1156 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:1186 +#: ../src/surfer.c:1194 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1423 +#: ../src/surfer.c:1431 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1436 msgid "Command:" msgstr "" -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1455 msgid "Message" msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1460 msgid "Source" msgstr "" -#: ../src/surfer.c:1457 +#: ../src/surfer.c:1465 msgid "Line" msgstr "" -#: ../src/surfer.c:1589 +#: ../src/surfer.c:1597 msgid "Web surfer preferences" msgstr "Web surfer preferencias" -#: ../src/surfer.c:1609 +#: ../src/surfer.c:1617 msgid "Homepage:" msgstr "" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1623 msgid "Tab handling" msgstr "" -#: ../src/surfer.c:1620 +#: ../src/surfer.c:1628 msgid "Focus new tabs" msgstr "" -#: ../src/surfer.c:1625 +#: ../src/surfer.c:1633 msgid "Downloads" msgstr "" -#: ../src/surfer.c:1628 +#: ../src/surfer.c:1636 msgid "Default download directory:" msgstr "" -#: ../src/surfer.c:1632 +#: ../src/surfer.c:1640 msgid "Choose the default download directory" msgstr "" -#: ../src/surfer.c:1639 +#: ../src/surfer.c:1645 +msgid "Close download windows when complete" +msgstr "" + +#: ../src/surfer.c:1651 msgid "General" msgstr "" -#: ../src/surfer.c:1643 +#: ../src/surfer.c:1655 msgid "Connectivity:" msgstr "" -#: ../src/surfer.c:1646 +#: ../src/surfer.c:1658 msgid "Direct connection" msgstr "" -#: ../src/surfer.c:1650 +#: ../src/surfer.c:1662 msgid "HTTP proxy:" msgstr "" -#: ../src/surfer.c:1657 +#: ../src/surfer.c:1669 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1661 +#: ../src/surfer.c:1673 msgid "Port:" msgstr "" -#: ../src/surfer.c:1671 +#: ../src/surfer.c:1683 msgid "Network" msgstr "" -#: ../src/surfer.c:1776 +#: ../src/surfer.c:1793 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1779 +#: ../src/surfer.c:1796 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1783 +#: ../src/surfer.c:1800 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1838 +#: ../src/surfer.c:1855 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1880 ../src/surfer.c:1883 ../src/surfer.c:1938 -#: ../src/surfer.c:1943 +#: ../src/surfer.c:1897 ../src/surfer.c:1900 ../src/surfer.c:1955 +#: ../src/surfer.c:1960 msgid "Warning" msgstr "" -#: ../src/surfer.c:1942 +#: ../src/surfer.c:1959 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 02e022e..bb32541 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-05-27 13:46+0200\n" +"POT-Creation-Date: 2011-06-11 18:34+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 -#: ../src/surfer.c:823 ../src/surfer.c:1280 ../src/surfer.c:1284 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:824 +#: ../src/surfer.c:827 ../src/surfer.c:1288 ../src/surfer.c:1292 msgid "Question" msgstr "Question" @@ -33,7 +33,7 @@ msgstr "" msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:566 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:573 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "Connecté" @@ -55,7 +55,7 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:645 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:652 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "Délai dépassé" @@ -95,67 +95,67 @@ 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:328 ../src/download.c:333 ../src/download.c:722 -#: ../src/surfer.c:971 ../src/surfer.c:974 +#: ../src/download.c:335 ../src/download.c:340 ../src/download.c:729 +#: ../src/surfer.c:979 ../src/surfer.c:982 msgid "Error" msgstr "Erreur" -#: ../src/download.c:382 ../src/download.c:408 +#: ../src/download.c:389 ../src/download.c:415 msgid "kB" msgstr "Kio" -#: ../src/download.c:403 ../src/download.c:414 ../src/download.c:433 +#: ../src/download.c:410 ../src/download.c:421 ../src/download.c:440 msgid "MB" msgstr "Mo" -#: ../src/download.c:405 +#: ../src/download.c:412 #, c-format msgid "%.1f %s/s" msgstr "%.1f %s/s" -#: ../src/download.c:416 +#: ../src/download.c:423 #, c-format msgid "%.1f %s" msgstr "%.1f %s/s" -#: ../src/download.c:435 +#: ../src/download.c:442 #, c-format msgid "%.1f of %.1f %s" msgstr "%.1f de %.1f %s" -#: ../src/download.c:574 +#: ../src/download.c:581 msgid "Error " msgstr "Erreur " -#: ../src/download.c:599 ../src/download.c:727 +#: ../src/download.c:606 ../src/download.c:734 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:609 ../src/download.c:745 +#: ../src/download.c:616 ../src/download.c:752 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:620 +#: ../src/download.c:627 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:623 +#: ../src/download.c:630 msgid "Redirected" msgstr "Redirigé" -#: ../src/download.c:630 +#: ../src/download.c:637 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:638 +#: ../src/download.c:645 msgid "Code " msgstr "Code " -#: ../src/download.c:696 ../src/ghtml-webkit.c:695 ../src/surfer.c:973 +#: ../src/download.c:703 ../src/ghtml-webkit.c:695 ../src/surfer.c:981 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:766 +#: ../src/download.c:773 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -198,155 +198,155 @@ msgstr "Méthode non supportée" msgid "Usage: surfer [URL...]\n" msgstr "Usage: surfer [URL...]\n" -#: ../src/surfer.c:107 +#: ../src/surfer.c:106 msgid "_New tab" msgstr "Nouvel ongle_t" -#: ../src/surfer.c:109 +#: ../src/surfer.c:108 msgid "_New window" msgstr "_Nouvelle fenêtre" -#: ../src/surfer.c:111 +#: ../src/surfer.c:110 msgid "_Open..." msgstr "_Ouvrir..." -#: ../src/surfer.c:113 +#: ../src/surfer.c:112 msgid "Open _URL..." msgstr "Ouvrir une _adresse..." -#: ../src/surfer.c:116 +#: ../src/surfer.c:115 msgid "Save _as..." msgstr "Enregistrer _sous..." -#: ../src/surfer.c:119 +#: ../src/surfer.c:118 msgid "_Print..." msgstr "Imprimer..." -#: ../src/surfer.c:122 +#: ../src/surfer.c:121 msgid "Close _tab" msgstr "F_ermer l'onglet" -#: ../src/surfer.c:124 +#: ../src/surfer.c:123 msgid "_Close" msgstr "F_ermer" -#: ../src/surfer.c:131 +#: ../src/surfer.c:130 msgid "_Undo" msgstr "A_nnuler" -#: ../src/surfer.c:133 +#: ../src/surfer.c:132 msgid "_Redo" msgstr "_Rétablir" -#: ../src/surfer.c:136 +#: ../src/surfer.c:135 msgid "_Cut" msgstr "Co_uper" -#: ../src/surfer.c:138 +#: ../src/surfer.c:137 msgid "Cop_y" msgstr "_Copier" -#: ../src/surfer.c:140 +#: ../src/surfer.c:139 msgid "_Paste" msgstr "C_oller" -#: ../src/surfer.c:143 +#: ../src/surfer.c:142 msgid "Select _all" msgstr "_Sélectionner tout" -#: ../src/surfer.c:150 +#: ../src/surfer.c:149 msgid "_Unselect all" msgstr "Tout _désélectionner" -#: ../src/surfer.c:152 +#: ../src/surfer.c:151 msgid "_Find" msgstr "Rechercher" -#: ../src/surfer.c:155 +#: ../src/surfer.c:154 msgid "_Preferences" msgstr "_Préférences" -#: ../src/surfer.c:162 ../src/surfer.c:220 +#: ../src/surfer.c:161 ../src/surfer.c:219 msgid "Zoom in" msgstr "Zoom +" -#: ../src/surfer.c:164 ../src/surfer.c:221 +#: ../src/surfer.c:163 ../src/surfer.c:220 msgid "Zoom out" msgstr "Zoom -" -#: ../src/surfer.c:166 ../src/surfer.c:222 +#: ../src/surfer.c:165 ../src/surfer.c:221 msgid "Normal size" msgstr "Taille normale" -#: ../src/surfer.c:169 +#: ../src/surfer.c:168 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../src/surfer.c:172 +#: ../src/surfer.c:171 msgid "_Refresh" msgstr "_Actualiser" -#: ../src/surfer.c:174 +#: ../src/surfer.c:173 msgid "_Force refresh" msgstr "Actualisation forcée" -#: ../src/surfer.c:176 +#: ../src/surfer.c:175 msgid "_Stop" msgstr "Arrêter" -#: ../src/surfer.c:179 +#: ../src/surfer.c:178 msgid "Javascript _console" msgstr "_Console Javascript" -#: ../src/surfer.c:181 +#: ../src/surfer.c:180 msgid "Page so_urce" msgstr "So_urce de la page" -#: ../src/surfer.c:188 +#: ../src/surfer.c:187 msgid "_About" msgstr "À _propos" -#: ../src/surfer.c:199 +#: ../src/surfer.c:198 msgid "_File" msgstr "_Fichier" -#: ../src/surfer.c:200 +#: ../src/surfer.c:199 msgid "_Edit" msgstr "É_dition" -#: ../src/surfer.c:201 +#: ../src/surfer.c:200 msgid "_View" msgstr "_Vue" -#: ../src/surfer.c:202 +#: ../src/surfer.c:201 msgid "_Help" msgstr "_Aide" -#: ../src/surfer.c:209 +#: ../src/surfer.c:208 msgid "Back" msgstr "Précédent" -#: ../src/surfer.c:211 +#: ../src/surfer.c:210 msgid "Forward" msgstr "Suivant" -#: ../src/surfer.c:213 +#: ../src/surfer.c:212 msgid "Stop" msgstr "Arrêter" -#: ../src/surfer.c:214 +#: ../src/surfer.c:213 msgid "Refresh" msgstr "Actualiser" -#: ../src/surfer.c:217 +#: ../src/surfer.c:216 msgid "Home" msgstr "Page d'accueil" -#: ../src/surfer.c:225 +#: ../src/surfer.c:224 msgid "New tab" msgstr "Nouvel onglet" -#: ../src/surfer.c:227 +#: ../src/surfer.c:226 msgid "New window" msgstr "Nouvelle fenêtre" @@ -358,7 +358,7 @@ msgstr "Web surfer" msgid " Location: " msgstr " Adresse: " -#: ../src/surfer.c:396 ../src/surfer.c:1790 ../src/surfer.c:1794 +#: ../src/surfer.c:396 ../src/surfer.c:1807 ../src/surfer.c:1811 msgid "Security information" msgstr "Informations de sécurité" @@ -366,143 +366,147 @@ msgstr "Informations de sécurité" msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:676 ../src/surfer.c:1196 +#: ../src/surfer.c:676 ../src/surfer.c:1204 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:921 ../src/surfer.c:1362 +#: ../src/surfer.c:926 ../src/surfer.c:1370 msgid "Save file as..." msgstr "Enregistrer sous..." -#: ../src/surfer.c:1002 +#: ../src/surfer.c:1010 msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1022 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:1022 +#: ../src/surfer.c:1030 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:1026 +#: ../src/surfer.c:1034 msgid "Search backwards" msgstr "Inverser le sens de la recherche" -#: ../src/surfer.c:1029 +#: ../src/surfer.c:1037 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:1059 +#: ../src/surfer.c:1067 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:1148 +#: ../src/surfer.c:1156 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:1186 +#: ../src/surfer.c:1194 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1423 +#: ../src/surfer.c:1431 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1436 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1455 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1460 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1457 +#: ../src/surfer.c:1465 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1589 +#: ../src/surfer.c:1597 msgid "Web surfer preferences" msgstr "Préférences de Web surfer" -#: ../src/surfer.c:1609 +#: ../src/surfer.c:1617 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1623 msgid "Tab handling" msgstr "Gestion des onglets" -#: ../src/surfer.c:1620 +#: ../src/surfer.c:1628 msgid "Focus new tabs" msgstr "Focaliser les nouveaux onglets" -#: ../src/surfer.c:1625 +#: ../src/surfer.c:1633 msgid "Downloads" msgstr "Téléchargements" -#: ../src/surfer.c:1628 +#: ../src/surfer.c:1636 msgid "Default download directory:" msgstr "Répertoire par défaut :" -#: ../src/surfer.c:1632 +#: ../src/surfer.c:1640 msgid "Choose the default download directory" msgstr "Choix du répertoire par défaut :" -#: ../src/surfer.c:1639 +#: ../src/surfer.c:1645 +msgid "Close download windows when complete" +msgstr "Fermer les fenêtres à la fin du téléchargement" + +#: ../src/surfer.c:1651 msgid "General" msgstr "Général" -#: ../src/surfer.c:1643 +#: ../src/surfer.c:1655 msgid "Connectivity:" msgstr "Connectivité :" -#: ../src/surfer.c:1646 +#: ../src/surfer.c:1658 msgid "Direct connection" msgstr "Connexion directe" -#: ../src/surfer.c:1650 +#: ../src/surfer.c:1662 msgid "HTTP proxy:" msgstr "Proxy HTTP :" -#: ../src/surfer.c:1657 +#: ../src/surfer.c:1669 msgid "Hostname:" msgstr "Hôte :" -#: ../src/surfer.c:1661 +#: ../src/surfer.c:1673 msgid "Port:" msgstr "Port :" -#: ../src/surfer.c:1671 +#: ../src/surfer.c:1683 msgid "Network" msgstr "Réseau" -#: ../src/surfer.c:1776 +#: ../src/surfer.c:1793 msgid "This connection is encrypted and trusted." msgstr "Cette connexion est chiffrée et de confiance." -#: ../src/surfer.c:1779 +#: ../src/surfer.c:1796 msgid "This connection is encrypted but not trusted." msgstr "Cette connexion est chiffrée mais pas de confiance." -#: ../src/surfer.c:1783 +#: ../src/surfer.c:1800 msgid "This connection is not encrypted." msgstr "Cette connexion n'est pas chiffrée." -#: ../src/surfer.c:1838 +#: ../src/surfer.c:1855 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1880 ../src/surfer.c:1883 ../src/surfer.c:1938 -#: ../src/surfer.c:1943 +#: ../src/surfer.c:1897 ../src/surfer.c:1900 ../src/surfer.c:1955 +#: ../src/surfer.c:1960 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1942 +#: ../src/surfer.c:1959 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" diff --git a/po/it.po b/po/it.po index a3e2d79..fd238d4 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-05-27 13:46+0200\n" +"POT-Creation-Date: 2011-06-11 18:34+0200\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 -#: ../src/surfer.c:823 ../src/surfer.c:1280 ../src/surfer.c:1284 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:824 +#: ../src/surfer.c:827 ../src/surfer.c:1288 ../src/surfer.c:1292 msgid "Question" msgstr "" @@ -31,7 +31,7 @@ msgstr "" msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:566 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:573 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:645 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:652 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -93,67 +93,67 @@ msgstr "" msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:328 ../src/download.c:333 ../src/download.c:722 -#: ../src/surfer.c:971 ../src/surfer.c:974 +#: ../src/download.c:335 ../src/download.c:340 ../src/download.c:729 +#: ../src/surfer.c:979 ../src/surfer.c:982 msgid "Error" msgstr "" -#: ../src/download.c:382 ../src/download.c:408 +#: ../src/download.c:389 ../src/download.c:415 msgid "kB" msgstr "" -#: ../src/download.c:403 ../src/download.c:414 ../src/download.c:433 +#: ../src/download.c:410 ../src/download.c:421 ../src/download.c:440 msgid "MB" msgstr "" -#: ../src/download.c:405 +#: ../src/download.c:412 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:416 +#: ../src/download.c:423 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:435 +#: ../src/download.c:442 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:574 +#: ../src/download.c:581 msgid "Error " msgstr "" -#: ../src/download.c:599 ../src/download.c:727 +#: ../src/download.c:606 ../src/download.c:734 msgid "Complete" msgstr "" -#: ../src/download.c:609 ../src/download.c:745 +#: ../src/download.c:616 ../src/download.c:752 msgid "Downloading" msgstr "" -#: ../src/download.c:620 +#: ../src/download.c:627 msgid "Redirected to" msgstr "" -#: ../src/download.c:623 +#: ../src/download.c:630 msgid "Redirected" msgstr "" -#: ../src/download.c:630 +#: ../src/download.c:637 msgid "Resolved" msgstr "" -#: ../src/download.c:638 +#: ../src/download.c:645 msgid "Code " msgstr "" -#: ../src/download.c:696 ../src/ghtml-webkit.c:695 ../src/surfer.c:973 +#: ../src/download.c:703 ../src/ghtml-webkit.c:695 ../src/surfer.c:981 msgid "Unknown error" msgstr "" -#: ../src/download.c:766 +#: ../src/download.c:773 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -193,155 +193,155 @@ msgstr "" msgid "Usage: surfer [URL...]\n" msgstr "" -#: ../src/surfer.c:107 +#: ../src/surfer.c:106 msgid "_New tab" msgstr "" -#: ../src/surfer.c:109 +#: ../src/surfer.c:108 msgid "_New window" msgstr "" -#: ../src/surfer.c:111 +#: ../src/surfer.c:110 msgid "_Open..." msgstr "" -#: ../src/surfer.c:113 +#: ../src/surfer.c:112 msgid "Open _URL..." msgstr "" -#: ../src/surfer.c:116 +#: ../src/surfer.c:115 msgid "Save _as..." msgstr "" -#: ../src/surfer.c:119 +#: ../src/surfer.c:118 msgid "_Print..." msgstr "" -#: ../src/surfer.c:122 +#: ../src/surfer.c:121 msgid "Close _tab" msgstr "" -#: ../src/surfer.c:124 +#: ../src/surfer.c:123 msgid "_Close" msgstr "" -#: ../src/surfer.c:131 +#: ../src/surfer.c:130 msgid "_Undo" msgstr "" -#: ../src/surfer.c:133 +#: ../src/surfer.c:132 msgid "_Redo" msgstr "" -#: ../src/surfer.c:136 +#: ../src/surfer.c:135 msgid "_Cut" msgstr "" -#: ../src/surfer.c:138 +#: ../src/surfer.c:137 msgid "Cop_y" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:139 msgid "_Paste" msgstr "" -#: ../src/surfer.c:143 +#: ../src/surfer.c:142 msgid "Select _all" msgstr "" -#: ../src/surfer.c:150 +#: ../src/surfer.c:149 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:152 +#: ../src/surfer.c:151 msgid "_Find" msgstr "" -#: ../src/surfer.c:155 +#: ../src/surfer.c:154 msgid "_Preferences" msgstr "" -#: ../src/surfer.c:162 ../src/surfer.c:220 +#: ../src/surfer.c:161 ../src/surfer.c:219 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:164 ../src/surfer.c:221 +#: ../src/surfer.c:163 ../src/surfer.c:220 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:166 ../src/surfer.c:222 +#: ../src/surfer.c:165 ../src/surfer.c:221 msgid "Normal size" msgstr "" -#: ../src/surfer.c:169 +#: ../src/surfer.c:168 msgid "_Fullscreen" msgstr "" -#: ../src/surfer.c:172 +#: ../src/surfer.c:171 msgid "_Refresh" msgstr "" -#: ../src/surfer.c:174 +#: ../src/surfer.c:173 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:176 +#: ../src/surfer.c:175 msgid "_Stop" msgstr "" -#: ../src/surfer.c:179 +#: ../src/surfer.c:178 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:181 +#: ../src/surfer.c:180 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:187 msgid "_About" msgstr "" -#: ../src/surfer.c:199 +#: ../src/surfer.c:198 msgid "_File" msgstr "" -#: ../src/surfer.c:200 +#: ../src/surfer.c:199 msgid "_Edit" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:200 msgid "_View" msgstr "" -#: ../src/surfer.c:202 +#: ../src/surfer.c:201 msgid "_Help" msgstr "" -#: ../src/surfer.c:209 +#: ../src/surfer.c:208 msgid "Back" msgstr "" -#: ../src/surfer.c:211 +#: ../src/surfer.c:210 msgid "Forward" msgstr "" -#: ../src/surfer.c:213 +#: ../src/surfer.c:212 msgid "Stop" msgstr "" -#: ../src/surfer.c:214 +#: ../src/surfer.c:213 msgid "Refresh" msgstr "" -#: ../src/surfer.c:217 +#: ../src/surfer.c:216 msgid "Home" msgstr "" -#: ../src/surfer.c:225 +#: ../src/surfer.c:224 msgid "New tab" msgstr "" -#: ../src/surfer.c:227 +#: ../src/surfer.c:226 msgid "New window" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid " Location: " msgstr "" -#: ../src/surfer.c:396 ../src/surfer.c:1790 ../src/surfer.c:1794 +#: ../src/surfer.c:396 ../src/surfer.c:1807 ../src/surfer.c:1811 msgid "Security information" msgstr "" @@ -361,143 +361,147 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:676 ../src/surfer.c:1196 +#: ../src/surfer.c:676 ../src/surfer.c:1204 msgid "Untitled" msgstr "" -#: ../src/surfer.c:921 ../src/surfer.c:1362 +#: ../src/surfer.c:926 ../src/surfer.c:1370 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:1002 +#: ../src/surfer.c:1010 msgid "Find text" msgstr "" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1022 msgid "Text:" msgstr "" -#: ../src/surfer.c:1022 +#: ../src/surfer.c:1030 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1026 +#: ../src/surfer.c:1034 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1029 +#: ../src/surfer.c:1037 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1059 +#: ../src/surfer.c:1067 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1148 +#: ../src/surfer.c:1156 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1186 +#: ../src/surfer.c:1194 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1423 +#: ../src/surfer.c:1431 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1436 msgid "Command:" msgstr "" -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1455 msgid "Message" msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1460 msgid "Source" msgstr "" -#: ../src/surfer.c:1457 +#: ../src/surfer.c:1465 msgid "Line" msgstr "" -#: ../src/surfer.c:1589 +#: ../src/surfer.c:1597 msgid "Web surfer preferences" msgstr "" -#: ../src/surfer.c:1609 +#: ../src/surfer.c:1617 msgid "Homepage:" msgstr "" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1623 msgid "Tab handling" msgstr "" -#: ../src/surfer.c:1620 +#: ../src/surfer.c:1628 msgid "Focus new tabs" msgstr "" -#: ../src/surfer.c:1625 +#: ../src/surfer.c:1633 msgid "Downloads" msgstr "" -#: ../src/surfer.c:1628 +#: ../src/surfer.c:1636 msgid "Default download directory:" msgstr "" -#: ../src/surfer.c:1632 +#: ../src/surfer.c:1640 msgid "Choose the default download directory" msgstr "" -#: ../src/surfer.c:1639 +#: ../src/surfer.c:1645 +msgid "Close download windows when complete" +msgstr "" + +#: ../src/surfer.c:1651 msgid "General" msgstr "" -#: ../src/surfer.c:1643 +#: ../src/surfer.c:1655 msgid "Connectivity:" msgstr "" -#: ../src/surfer.c:1646 +#: ../src/surfer.c:1658 msgid "Direct connection" msgstr "" -#: ../src/surfer.c:1650 +#: ../src/surfer.c:1662 msgid "HTTP proxy:" msgstr "" -#: ../src/surfer.c:1657 +#: ../src/surfer.c:1669 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1661 +#: ../src/surfer.c:1673 msgid "Port:" msgstr "" -#: ../src/surfer.c:1671 +#: ../src/surfer.c:1683 msgid "Network" msgstr "" -#: ../src/surfer.c:1776 +#: ../src/surfer.c:1793 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1779 +#: ../src/surfer.c:1796 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1783 +#: ../src/surfer.c:1800 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1838 +#: ../src/surfer.c:1855 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1880 ../src/surfer.c:1883 ../src/surfer.c:1938 -#: ../src/surfer.c:1943 +#: ../src/surfer.c:1897 ../src/surfer.c:1900 ../src/surfer.c:1955 +#: ../src/surfer.c:1960 msgid "Warning" msgstr "" -#: ../src/surfer.c:1942 +#: ../src/surfer.c:1959 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/common.h b/src/common.h index acb0ed8..68c2130 100644 --- a/src/common.h +++ b/src/common.h @@ -31,6 +31,7 @@ struct _Surfer /* preferences */ char * homepage; char * download_dir; + unsigned int download_close; SurferProxyType proxy_type; char * proxy_http; unsigned int proxy_http_port; @@ -61,6 +62,7 @@ struct _Surfer GtkWidget * pr_homepage; GtkWidget * pr_focus_tabs; GtkWidget * pr_download_dir; + GtkWidget * pr_download_close; GtkWidget * pr_proxy_radio_direct; GtkWidget * pr_proxy_radio_http; GtkWidget * pr_proxy_http; diff --git a/src/download.c b/src/download.c index 3443552..880faf4 100644 --- a/src/download.c +++ b/src/download.c @@ -298,6 +298,13 @@ void download_delete(Download * download) } +/* accessors */ +void download_set_close(Download * download, gboolean close) +{ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(download->check), close); +} + + /* useful */ /* download_cancel */ int download_cancel(Download * download) diff --git a/src/download.h b/src/download.h index 26168e1..435124b 100644 --- a/src/download.h +++ b/src/download.h @@ -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 @@ -34,6 +34,8 @@ typedef struct _DownloadPrefs Download * download_new(DownloadPrefs * prefs, char const * url); void download_delete(Download * download); +/* accessors */ +void download_set_close(Download * download, gboolean close); /* useful */ int download_cancel(Download * download); diff --git a/src/surfer.c b/src/surfer.c index 9554412..6712f2b 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -14,9 +14,8 @@ static char const _license[] = "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see ."; -/* FIXME: +/* TODO: * - implement a default download directory (and "always ask") - * - add "new tab" and "new window" buttons to the embedded interface * - consider using GtkSourceView to display the page source */ @@ -286,10 +285,11 @@ Surfer * _new_do(char const * url) GtkToolItem * toolitem; GtkWidget * widget; - if((surfer = malloc(sizeof(*surfer))) == NULL) + if((surfer = object_new(sizeof(*surfer))) == NULL) return NULL; surfer->homepage = NULL; surfer->download_dir = NULL; + surfer->download_close = 0; surfer->proxy_type = SPT_NONE; surfer->proxy_http = NULL; surfer->proxy_http_port = 0; @@ -464,7 +464,7 @@ void surfer_delete(Surfer * surfer) free(surfer->proxy_http); free(surfer->download_dir); free(surfer->homepage); - free(surfer); + object_delete(surfer); if(--_surfer_cnt == 0) gtk_main_quit(); } @@ -757,6 +757,8 @@ int surfer_config_load(Surfer * surfer) &surfer->homepage); _config_load_string(surfer->config, NULL, "download_directory", &surfer->download_dir); + _config_load_integer(surfer->config, NULL, "download_close", + &surfer->download_close); if((p = getenv("http_proxy")) != NULL && sscanf(p, "http://%255[^:]:%u", buf, &port) == 2) { @@ -790,6 +792,8 @@ int surfer_config_save(Surfer * surfer) surfer->homepage); ret |= _config_save_string(surfer->config, NULL, "download_directory", surfer->download_dir); + ret |= _config_save_boolean(surfer->config, NULL, "download_close", + surfer->download_close); ret |= _config_save_boolean(surfer->config, NULL, "focus_new_tabs", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( surfer->pr_focus_tabs))); @@ -911,6 +915,7 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested) char * filename = NULL; #ifdef WITH_DOWNLOAD DownloadPrefs prefs; + Download * download; #else char * argv[] = { "download", "-O", NULL, NULL, NULL }; GError * error = NULL; @@ -943,7 +948,10 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested) #ifdef WITH_DOWNLOAD prefs.output = filename; prefs.user_agent = NULL; - download_new(&prefs, url); + if((download = download_new(&prefs, url)) == NULL) + ret = -surfer_error(surfer, error_get(), 1); + else + download_set_close(download, surfer->download_close); #else argv[2] = filename; if((argv[3] = strdup(url)) == NULL) @@ -1276,7 +1284,7 @@ int surfer_prompt(Surfer * surfer, char const * message, ? GTK_WINDOW(surfer->window) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, -#if GTK_CHECK_VERSION(2, 8, 0) +#if GTK_CHECK_VERSION(2, 6, 0) "%s", _("Question")); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), #endif @@ -1633,6 +1641,10 @@ void surfer_view_preferences(Surfer * surfer) GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_download_dir, TRUE, TRUE, 0); + surfer->pr_download_close = gtk_check_button_new_with_label( + _("Close download windows when complete")); + gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_download_close, FALSE, + TRUE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_box_pack_start(GTK_BOX(page), frame, FALSE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, @@ -1680,7 +1692,7 @@ static void _preferences_set(Surfer * surfer) gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), (surfer->homepage != NULL) ? surfer->homepage : ""); - if((p = config_get(surfer->config, "", "focus_new_tabs")) != NULL + if((p = config_get(surfer->config, NULL, "focus_new_tabs")) != NULL && strcmp(p, "1") == 0) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( surfer->pr_focus_tabs), TRUE); @@ -1692,6 +1704,9 @@ static void _preferences_set(Surfer * surfer) gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(surfer->pr_download_dir), (surfer->download_dir != NULL) ? surfer->download_dir : g_get_home_dir()); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + surfer->pr_download_close), + surfer->download_close); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( surfer->pr_proxy_radio_http), surfer->proxy_type == SPT_HTTP); @@ -1737,6 +1752,8 @@ static void _preferences_on_ok(gpointer data) gtk_widget_hide(surfer->pr_window); surfer_set_homepage(surfer, gtk_entry_get_text(GTK_ENTRY( surfer->pr_homepage))); + surfer->download_close = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(surfer->pr_download_close)); if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( surfer->pr_proxy_radio_http))) type = SPT_HTTP;