diff --git a/po/de.po b/po/de.po index c371874..0ae56c8 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-12-03 23:37+0100\n" +"POT-Creation-Date: 2010-12-04 02:13+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -20,45 +20,53 @@ msgstr "" msgid "Web surfer preferences" msgstr "Web surfer Einstellungen" -#: ../src/callbacks.c:445 +#: ../src/callbacks.c:446 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:453 +#: ../src/callbacks.c:454 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:457 +#: ../src/callbacks.c:458 msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 +#: ../src/callbacks.c:464 +msgid "HTTP proxy:" +msgstr "" + +#: ../src/callbacks.c:470 +msgid "Network" +msgstr "" + +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:916 -#: ../src/ghtml-webkit.c:396 ../src/ghtml-webkit.c:533 -#: ../src/ghtml-webkit.c:546 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 +#: ../src/ghtml-webkit.c:403 ../src/ghtml-webkit.c:540 +#: ../src/ghtml-webkit.c:553 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:962 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:966 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:971 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 msgid "Timeout" msgstr "" @@ -95,7 +103,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 -#: ../src/surfer.c:795 ../src/surfer.c:798 +#: ../src/surfer.c:822 ../src/surfer.c:825 msgid "Error" msgstr "Fehler" @@ -150,7 +158,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:496 ../src/surfer.c:824 msgid "Unknown error" msgstr "" @@ -161,32 +169,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:708 +#: ../src/ghtml-gtkhtml.c:706 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:774 +#: ../src/ghtml-gtkhtml.c:772 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:986 +#: ../src/ghtml-gtkhtml.c:984 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:994 +#: ../src/ghtml-gtkhtml.c:992 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1028 ../src/ghtml-webkit.c:291 -#: ../src/ghtml-webkit.c:394 +#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:298 +#: ../src/ghtml-webkit.c:401 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1031 +#: ../src/ghtml-gtkhtml.c:1029 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1189 +#: ../src/ghtml-gtkhtml.c:1187 msgid "Unsupported method" msgstr "" @@ -322,88 +330,88 @@ msgstr "" msgid "Home" msgstr "" -#: ../src/surfer.c:285 ../src/surfer.c:549 +#: ../src/surfer.c:286 ../src/surfer.c:571 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:333 +#: ../src/surfer.c:334 msgid " Location: " msgstr "" -#: ../src/surfer.c:519 +#: ../src/surfer.c:541 msgid "Ready" msgstr "" -#: ../src/surfer.c:562 ../src/surfer.c:992 +#: ../src/surfer.c:584 ../src/surfer.c:1021 msgid "Untitled" msgstr "" -#: ../src/surfer.c:675 ../src/surfer.c:678 ../src/surfer.c:1057 -#: ../src/surfer.c:1060 +#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 +#: ../src/surfer.c:1089 msgid "Question" msgstr "" -#: ../src/surfer.c:748 ../src/surfer.c:1123 +#: ../src/surfer.c:775 ../src/surfer.c:1152 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:826 +#: ../src/surfer.c:853 msgid "Find text" msgstr "Suchen" -#: ../src/surfer.c:833 +#: ../src/surfer.c:860 msgid "Text:" msgstr "" -#: ../src/surfer.c:840 +#: ../src/surfer.c:867 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:842 +#: ../src/surfer.c:869 msgid "Wrap" msgstr "" -#: ../src/surfer.c:868 +#: ../src/surfer.c:895 msgid "Text not found" msgstr "" -#: ../src/surfer.c:956 +#: ../src/surfer.c:983 msgid "Open file..." msgstr "" -#: ../src/surfer.c:985 +#: ../src/surfer.c:1012 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1184 +#: ../src/surfer.c:1213 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1189 +#: ../src/surfer.c:1218 msgid "Command:" msgstr "" -#: ../src/surfer.c:1208 +#: ../src/surfer.c:1237 msgid "Message" msgstr "" -#: ../src/surfer.c:1213 +#: ../src/surfer.c:1242 msgid "Source" msgstr "" -#: ../src/surfer.c:1218 +#: ../src/surfer.c:1247 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1343 +#: ../src/surfer.c:1372 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1384 ../src/surfer.c:1387 ../src/surfer.c:1442 -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 +#: ../src/surfer.c:1476 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1446 +#: ../src/surfer.c:1475 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index 6e2bc0a..f3061f6 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-12-03 23:37+0100\n" +"POT-Creation-Date: 2010-12-04 02:13+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -20,45 +20,53 @@ msgstr "" msgid "Web surfer preferences" msgstr "Web surfer preferencias" -#: ../src/callbacks.c:445 +#: ../src/callbacks.c:446 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:453 +#: ../src/callbacks.c:454 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:457 +#: ../src/callbacks.c:458 msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 +#: ../src/callbacks.c:464 +msgid "HTTP proxy:" +msgstr "" + +#: ../src/callbacks.c:470 +msgid "Network" +msgstr "" + +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:916 -#: ../src/ghtml-webkit.c:396 ../src/ghtml-webkit.c:533 -#: ../src/ghtml-webkit.c:546 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 +#: ../src/ghtml-webkit.c:403 ../src/ghtml-webkit.c:540 +#: ../src/ghtml-webkit.c:553 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:962 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:966 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:971 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 msgid "Timeout" msgstr "" @@ -95,7 +103,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 -#: ../src/surfer.c:795 ../src/surfer.c:798 +#: ../src/surfer.c:822 ../src/surfer.c:825 msgid "Error" msgstr "" @@ -150,7 +158,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:496 ../src/surfer.c:824 msgid "Unknown error" msgstr "" @@ -161,32 +169,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:708 +#: ../src/ghtml-gtkhtml.c:706 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:774 +#: ../src/ghtml-gtkhtml.c:772 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:986 +#: ../src/ghtml-gtkhtml.c:984 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:994 +#: ../src/ghtml-gtkhtml.c:992 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1028 ../src/ghtml-webkit.c:291 -#: ../src/ghtml-webkit.c:394 +#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:298 +#: ../src/ghtml-webkit.c:401 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1031 +#: ../src/ghtml-gtkhtml.c:1029 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1189 +#: ../src/ghtml-gtkhtml.c:1187 msgid "Unsupported method" msgstr "" @@ -322,88 +330,88 @@ msgstr "" msgid "Home" msgstr "" -#: ../src/surfer.c:285 ../src/surfer.c:549 +#: ../src/surfer.c:286 ../src/surfer.c:571 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:333 +#: ../src/surfer.c:334 msgid " Location: " msgstr "" -#: ../src/surfer.c:519 +#: ../src/surfer.c:541 msgid "Ready" msgstr "" -#: ../src/surfer.c:562 ../src/surfer.c:992 +#: ../src/surfer.c:584 ../src/surfer.c:1021 msgid "Untitled" msgstr "" -#: ../src/surfer.c:675 ../src/surfer.c:678 ../src/surfer.c:1057 -#: ../src/surfer.c:1060 +#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 +#: ../src/surfer.c:1089 msgid "Question" msgstr "" -#: ../src/surfer.c:748 ../src/surfer.c:1123 +#: ../src/surfer.c:775 ../src/surfer.c:1152 msgid "Save file as..." msgstr "Guardar como..." -#: ../src/surfer.c:826 +#: ../src/surfer.c:853 msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:833 +#: ../src/surfer.c:860 msgid "Text:" msgstr "" -#: ../src/surfer.c:840 +#: ../src/surfer.c:867 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:842 +#: ../src/surfer.c:869 msgid "Wrap" msgstr "" -#: ../src/surfer.c:868 +#: ../src/surfer.c:895 msgid "Text not found" msgstr "" -#: ../src/surfer.c:956 +#: ../src/surfer.c:983 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:985 +#: ../src/surfer.c:1012 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1184 +#: ../src/surfer.c:1213 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1189 +#: ../src/surfer.c:1218 msgid "Command:" msgstr "" -#: ../src/surfer.c:1208 +#: ../src/surfer.c:1237 msgid "Message" msgstr "" -#: ../src/surfer.c:1213 +#: ../src/surfer.c:1242 msgid "Source" msgstr "" -#: ../src/surfer.c:1218 +#: ../src/surfer.c:1247 msgid "Line" msgstr "" -#: ../src/surfer.c:1343 +#: ../src/surfer.c:1372 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1384 ../src/surfer.c:1387 ../src/surfer.c:1442 -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 +#: ../src/surfer.c:1476 msgid "Warning" msgstr "" -#: ../src/surfer.c:1446 +#: ../src/surfer.c:1475 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index f81641b..9f03f0e 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-12-03 23:37+0100\n" +"POT-Creation-Date: 2010-12-04 02:13+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -20,45 +20,53 @@ msgstr "" msgid "Web surfer preferences" msgstr "Préférences de Web surfer" -#: ../src/callbacks.c:445 +#: ../src/callbacks.c:446 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../src/callbacks.c:453 +#: ../src/callbacks.c:454 msgid "Focus new tabs" msgstr "Focaliser les nouveaux onglets" -#: ../src/callbacks.c:457 +#: ../src/callbacks.c:458 msgid "General" msgstr "Général" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 +#: ../src/callbacks.c:464 +msgid "HTTP proxy:" +msgstr "Proxy HTTP :" + +#: ../src/callbacks.c:470 +msgid "Network" +msgstr "Réseau" + +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 msgid "Connected" msgstr "Connecté" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:916 -#: ../src/ghtml-webkit.c:396 ../src/ghtml-webkit.c:533 -#: ../src/ghtml-webkit.c:546 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 +#: ../src/ghtml-webkit.c:403 ../src/ghtml-webkit.c:540 +#: ../src/ghtml-webkit.c:553 msgid "Downloading..." msgstr "Téléchargement..." -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:962 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 msgid "Unsupported protocol" msgstr "Protocole non supporté" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:966 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:971 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 msgid "Timeout" msgstr "Délai dépassé" @@ -95,7 +103,7 @@ 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:623 -#: ../src/surfer.c:795 ../src/surfer.c:798 +#: ../src/surfer.c:822 ../src/surfer.c:825 msgid "Error" msgstr "Erreur" @@ -150,7 +158,7 @@ msgstr "Résolu" msgid "Code " msgstr "Code " -#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:496 ../src/surfer.c:824 msgid "Unknown error" msgstr "Erreur inconnue" @@ -164,32 +172,32 @@ msgstr "" " -O\tfichier de destination\n" " -U\tuser-agent à utiliser\n" -#: ../src/ghtml-gtkhtml.c:708 +#: ../src/ghtml-gtkhtml.c:706 msgid "Unknown protocol" msgstr "Protocole inconnu" -#: ../src/ghtml-gtkhtml.c:774 +#: ../src/ghtml-gtkhtml.c:772 msgid "Reading file..." msgstr "Lecture du fichier..." -#: ../src/ghtml-gtkhtml.c:986 +#: ../src/ghtml-gtkhtml.c:984 msgid "Redirecting..." msgstr "Redirection..." -#: ../src/ghtml-gtkhtml.c:994 +#: ../src/ghtml-gtkhtml.c:992 msgid "Redirecting to " msgstr "Redirection vers " -#: ../src/ghtml-gtkhtml.c:1028 ../src/ghtml-webkit.c:291 -#: ../src/ghtml-webkit.c:394 +#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:298 +#: ../src/ghtml-webkit.c:401 msgid "Connecting..." msgstr "Connexion..." -#: ../src/ghtml-gtkhtml.c:1031 +#: ../src/ghtml-gtkhtml.c:1029 msgid "Connecting to " msgstr "Connexion à " -#: ../src/ghtml-gtkhtml.c:1189 +#: ../src/ghtml-gtkhtml.c:1187 msgid "Unsupported method" msgstr "Méthode non supportée" @@ -325,88 +333,88 @@ msgstr "Actualiser" msgid "Home" msgstr "Page d'accueil" -#: ../src/surfer.c:285 ../src/surfer.c:549 +#: ../src/surfer.c:286 ../src/surfer.c:571 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:333 +#: ../src/surfer.c:334 msgid " Location: " msgstr " Adresse: " -#: ../src/surfer.c:519 +#: ../src/surfer.c:541 msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:562 ../src/surfer.c:992 +#: ../src/surfer.c:584 ../src/surfer.c:1021 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:675 ../src/surfer.c:678 ../src/surfer.c:1057 -#: ../src/surfer.c:1060 +#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 +#: ../src/surfer.c:1089 msgid "Question" msgstr "Question" -#: ../src/surfer.c:748 ../src/surfer.c:1123 +#: ../src/surfer.c:775 ../src/surfer.c:1152 msgid "Save file as..." msgstr "Enregistrer sous..." -#: ../src/surfer.c:826 +#: ../src/surfer.c:853 msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:833 +#: ../src/surfer.c:860 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:840 +#: ../src/surfer.c:867 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:842 +#: ../src/surfer.c:869 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:868 +#: ../src/surfer.c:895 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:956 +#: ../src/surfer.c:983 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:985 +#: ../src/surfer.c:1012 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1184 +#: ../src/surfer.c:1213 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1189 +#: ../src/surfer.c:1218 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1208 +#: ../src/surfer.c:1237 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1213 +#: ../src/surfer.c:1242 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1218 +#: ../src/surfer.c:1247 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1343 +#: ../src/surfer.c:1372 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1384 ../src/surfer.c:1387 ../src/surfer.c:1442 -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 +#: ../src/surfer.c:1476 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1446 +#: ../src/surfer.c:1475 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 f6d349f..b7a8eca 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-12-03 23:37+0100\n" +"POT-Creation-Date: 2010-12-04 02:13+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -20,45 +20,53 @@ msgstr "" msgid "Web surfer preferences" msgstr "" -#: ../src/callbacks.c:445 +#: ../src/callbacks.c:446 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:453 +#: ../src/callbacks.c:454 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:457 +#: ../src/callbacks.c:458 msgid "General" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:831 +#: ../src/callbacks.c:464 +msgid "HTTP proxy:" +msgstr "" + +#: ../src/callbacks.c:470 +msgid "Network" +msgstr "" + +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:881 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:916 -#: ../src/ghtml-webkit.c:396 ../src/ghtml-webkit.c:533 -#: ../src/ghtml-webkit.c:546 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 +#: ../src/ghtml-webkit.c:403 ../src/ghtml-webkit.c:540 +#: ../src/ghtml-webkit.c:553 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:962 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:966 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:971 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1067 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 msgid "Timeout" msgstr "" @@ -95,7 +103,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:623 -#: ../src/surfer.c:795 ../src/surfer.c:798 +#: ../src/surfer.c:822 ../src/surfer.c:825 msgid "Error" msgstr "" @@ -150,7 +158,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:597 ../src/ghtml-webkit.c:489 ../src/surfer.c:797 +#: ../src/download.c:597 ../src/ghtml-webkit.c:496 ../src/surfer.c:824 msgid "Unknown error" msgstr "" @@ -161,32 +169,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:708 +#: ../src/ghtml-gtkhtml.c:706 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:774 +#: ../src/ghtml-gtkhtml.c:772 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:986 +#: ../src/ghtml-gtkhtml.c:984 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:994 +#: ../src/ghtml-gtkhtml.c:992 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1028 ../src/ghtml-webkit.c:291 -#: ../src/ghtml-webkit.c:394 +#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:298 +#: ../src/ghtml-webkit.c:401 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1031 +#: ../src/ghtml-gtkhtml.c:1029 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1189 +#: ../src/ghtml-gtkhtml.c:1187 msgid "Unsupported method" msgstr "" @@ -322,88 +330,88 @@ msgstr "" msgid "Home" msgstr "" -#: ../src/surfer.c:285 ../src/surfer.c:549 +#: ../src/surfer.c:286 ../src/surfer.c:571 msgid "Web surfer" msgstr "" -#: ../src/surfer.c:333 +#: ../src/surfer.c:334 msgid " Location: " msgstr "" -#: ../src/surfer.c:519 +#: ../src/surfer.c:541 msgid "Ready" msgstr "" -#: ../src/surfer.c:562 ../src/surfer.c:992 +#: ../src/surfer.c:584 ../src/surfer.c:1021 msgid "Untitled" msgstr "" -#: ../src/surfer.c:675 ../src/surfer.c:678 ../src/surfer.c:1057 -#: ../src/surfer.c:1060 +#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 +#: ../src/surfer.c:1089 msgid "Question" msgstr "" -#: ../src/surfer.c:748 ../src/surfer.c:1123 +#: ../src/surfer.c:775 ../src/surfer.c:1152 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:826 +#: ../src/surfer.c:853 msgid "Find text" msgstr "" -#: ../src/surfer.c:833 +#: ../src/surfer.c:860 msgid "Text:" msgstr "" -#: ../src/surfer.c:840 +#: ../src/surfer.c:867 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:842 +#: ../src/surfer.c:869 msgid "Wrap" msgstr "" -#: ../src/surfer.c:868 +#: ../src/surfer.c:895 msgid "Text not found" msgstr "" -#: ../src/surfer.c:956 +#: ../src/surfer.c:983 msgid "Open file..." msgstr "" -#: ../src/surfer.c:985 +#: ../src/surfer.c:1012 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1184 +#: ../src/surfer.c:1213 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1189 +#: ../src/surfer.c:1218 msgid "Command:" msgstr "" -#: ../src/surfer.c:1208 +#: ../src/surfer.c:1237 msgid "Message" msgstr "" -#: ../src/surfer.c:1213 +#: ../src/surfer.c:1242 msgid "Source" msgstr "" -#: ../src/surfer.c:1218 +#: ../src/surfer.c:1247 msgid "Line" msgstr "" -#: ../src/surfer.c:1343 +#: ../src/surfer.c:1372 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1384 ../src/surfer.c:1387 ../src/surfer.c:1442 -#: ../src/surfer.c:1447 +#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 +#: ../src/surfer.c:1476 msgid "Warning" msgstr "" -#: ../src/surfer.c:1446 +#: ../src/surfer.c:1475 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/callbacks.c b/src/callbacks.c index d5a5402..021ab77 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -439,11 +439,12 @@ void on_preferences(gpointer data) /* notebook */ notebook = gtk_notebook_new(); /* general tab */ - page = gtk_vbox_new(FALSE, 0); + page = gtk_vbox_new(FALSE, 4); + gtk_container_set_border_width(GTK_CONTAINER(page), 4); /* homepage */ hbox = gtk_hbox_new(FALSE, 4); widget = gtk_label_new(_("Homepage:")); - gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); surfer->pr_homepage = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_homepage, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); @@ -455,6 +456,18 @@ void on_preferences(gpointer data) gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(_("General"))); + /* network tab */ + page = gtk_vbox_new(FALSE, 4); + gtk_container_set_border_width(GTK_CONTAINER(page), 4); + /* http proxy */ + hbox = gtk_hbox_new(FALSE, 4); + widget = gtk_label_new(_("HTTP proxy:")); + gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); + surfer->pr_proxy_http = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, + gtk_label_new(_("Network"))); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); _preferences_set(surfer); gtk_widget_show_all(surfer->pr_window); @@ -473,6 +486,8 @@ static void _preferences_set(Surfer * surfer) else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( surfer->pr_focus_tabs), FALSE); + if((p = config_get(surfer->config, "proxy", "http")) != NULL) + gtk_entry_set_text(GTK_ENTRY(surfer->pr_proxy_http), p); } static gboolean _preferences_on_closex(gpointer data) @@ -508,6 +523,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_set_proxy(surfer, gtk_entry_get_text(GTK_ENTRY( + surfer->pr_proxy_http))); surfer_config_save(surfer); } diff --git a/src/common.h b/src/common.h index ee39b7f..b1a7c9c 100644 --- a/src/common.h +++ b/src/common.h @@ -30,6 +30,7 @@ struct _Surfer /* preferences */ char * homepage; + char * proxy_http; /* widgets */ /* main window */ @@ -55,6 +56,7 @@ struct _Surfer GtkWidget * pr_window; GtkWidget * pr_homepage; GtkWidget * pr_focus_tabs; + GtkWidget * pr_proxy_http; /* find */ GtkWidget * fi_dialog; diff --git a/src/ghtml-gtkhtml.c b/src/ghtml-gtkhtml.c index 97b7d55..2a90e0d 100644 --- a/src/ghtml-gtkhtml.c +++ b/src/ghtml-gtkhtml.c @@ -271,13 +271,11 @@ char const * ghtml_get_title(GtkWidget * widget) } -/* ghtml_set_base */ -int ghtml_set_base(GtkWidget * widget, char const * url) +/* ghtml_set_proxy */ +int ghtml_set_proxy(GtkWidget * ghtml, char const * http) { - GHtml * ghtml; - - ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); - return _ghtml_set_base(ghtml, url); + /* FIXME really implement */ + return -1; } diff --git a/src/ghtml-gtkmozembed.c b/src/ghtml-gtkmozembed.c index 8c54b63..84f9fe7 100644 --- a/src/ghtml-gtkmozembed.c +++ b/src/ghtml-gtkmozembed.c @@ -392,6 +392,14 @@ char const * ghtml_get_title(GtkWidget * ghtml) } +/* ghtml_set_proxy */ +int ghtml_set_proxy(GtkWidget * ghtml, char const * http) +{ + /* FIXME really implement */ + return -1; +} + + /* useful */ /* ghtml_execute */ void ghtml_execute(GtkWidget * ghtml, char const * code) diff --git a/src/ghtml-gtktextview.c b/src/ghtml-gtktextview.c index 9533c65..f2106c0 100644 --- a/src/ghtml-gtktextview.c +++ b/src/ghtml-gtktextview.c @@ -423,6 +423,14 @@ char const * ghtml_get_title(GtkWidget * widget) } +/* ghtml_set_proxy */ +int ghtml_set_proxy(GtkWidget * ghtml, char const * http) +{ + /* FIXME really implement */ + return -1; +} + + /* useful */ /* ghtml_execute */ void ghtml_execute(GtkWidget * ghtml, char const * code) diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c index 0556ce6..4ed419e 100644 --- a/src/ghtml-webkit.c +++ b/src/ghtml-webkit.c @@ -210,6 +210,7 @@ char const * ghtml_get_status(GtkWidget * widget) } +/* ghtml_get_title */ char const * ghtml_get_title(GtkWidget * ghtml) { GtkWidget * view; @@ -221,10 +222,16 @@ char const * ghtml_get_title(GtkWidget * ghtml) } -int ghtml_set_base(GtkWidget * ghtml, char const * url) +/* ghtml_set_proxy */ +int ghtml_set_proxy(GtkWidget * ghtml, char const * http) { - /* FIXME implement */ - return 1; + SoupSession * session; + SoupURI * uri; + + session = webkit_get_default_session(); + uri = soup_uri_new(http); + g_object_set(session, "proxy-uri", uri, NULL); + return 0; } diff --git a/src/ghtml.h b/src/ghtml.h index 6921952..57d5653 100644 --- a/src/ghtml.h +++ b/src/ghtml.h @@ -38,7 +38,7 @@ char const * ghtml_get_source(GtkWidget * ghtml); char const * ghtml_get_status(GtkWidget * ghtml); char const * ghtml_get_title(GtkWidget * ghtml); -int ghtml_set_base(GtkWidget * ghtml, char const * url); +int ghtml_set_proxy(GtkWidget * ghtml, char const * http); /* useful */ gboolean ghtml_go_back(GtkWidget * ghtml); diff --git a/src/surfer.c b/src/surfer.c index ae7a15f..0f574e2 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -218,12 +218,12 @@ static gboolean _surfer_filename_confirm(Surfer * surfer, char const * filename); static char * _config_get_filename(void); -static int _config_load_string(Config * config, char const * variable, - char ** value); -static int _config_save_boolean(Config * config, char const * variable, - gboolean value); -static int _config_save_string(Config * config, char const * variable, - char const * value); +static int _config_load_string(Config * config, char const * section, + char const * variable, char ** value); +static int _config_save_boolean(Config * config, char const * section, + char const * variable, gboolean value); +static int _config_save_string(Config * config, char const * section, + char const * variable, char const * value); /* public */ @@ -267,6 +267,7 @@ Surfer * _new_do(char const * url) if((surfer = malloc(sizeof(*surfer))) == NULL) return NULL; surfer->homepage = NULL; + surfer->proxy_http = NULL; if((surfer->config = config_new()) == NULL || surfer_config_load(surfer) != 0) { @@ -418,6 +419,7 @@ void surfer_delete(Surfer * surfer) { gtk_widget_destroy(surfer->window); config_delete(surfer->config); + free(surfer->proxy_http); free(surfer->homepage); free(surfer); if(--_surfer_cnt == 0) @@ -501,6 +503,26 @@ void surfer_set_progress(Surfer * surfer, gdouble fraction) } +/* surfer_set_proxy */ +void surfer_set_proxy(Surfer * surfer, char const * http) +{ + GtkWidget * view; + gint n; + gint i; + + free(surfer->proxy_http); + if((surfer->proxy_http = strdup(http)) == NULL) + return; /* XXX report error */ + n = gtk_notebook_get_n_pages(GTK_NOTEBOOK(surfer->notebook)); + for(i = 0; i < n; i++) + { + view = gtk_notebook_get_nth_page(GTK_NOTEBOOK(surfer->notebook), + i); + ghtml_set_proxy(view, http); + } +} + + /* surfer_set_status */ void surfer_set_status(Surfer * surfer, char const * status) { @@ -636,7 +658,10 @@ int surfer_config_load(Surfer * surfer) return 1; config_load(surfer->config, filename); /* XXX ignore errors */ free(filename); - _config_load_string(surfer->config, "homepage", &surfer->homepage); + _config_load_string(surfer->config, NULL, "homepage", + &surfer->homepage); + _config_load_string(surfer->config, "proxy", "http", + &surfer->proxy_http); return 0; } @@ -649,11 +674,13 @@ int surfer_config_save(Surfer * surfer) if((filename = _config_get_filename()) == NULL) return 1; - ret |= _config_save_string(surfer->config, "homepage", + ret |= _config_save_string(surfer->config, NULL, "homepage", surfer->homepage); - ret |= _config_save_boolean(surfer->config, "focus_new_tabs", + ret |= _config_save_boolean(surfer->config, NULL, "focus_new_tabs", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( surfer->pr_focus_tabs))); + ret |= _config_save_string(surfer->config, "proxy", "http", + surfer->proxy_http); if(ret == 0) ret |= config_save(surfer->config, filename); free(filename); @@ -985,6 +1012,8 @@ void surfer_open_tab(Surfer * surfer, char const * url) surfer_error(NULL, _("Could not initialize HTML renderer"), 0); return; } + if(surfer->proxy_http != NULL) + ghtml_set_proxy(widget, surfer->proxy_http); gtk_widget_show_all(widget); /* must be before set_current_page() */ if(url != NULL) ghtml_load_url(widget, url); @@ -1471,13 +1500,13 @@ static char * _config_get_filename(void) /* config_load_string */ -static int _config_load_string(Config * config, char const * variable, - char ** value) +static int _config_load_string(Config * config, char const * section, + char const * variable, char ** value) { char const * str; char * p; - if((str = config_get(config, "", variable)) == NULL) + if((str = config_get(config, section, variable)) == NULL) return 0; if((p = strdup(str)) == NULL) return 1; @@ -1488,16 +1517,16 @@ static int _config_load_string(Config * config, char const * variable, /* config_save_boolean */ -static int _config_save_boolean(Config * config, char const * variable, - gboolean value) +static int _config_save_boolean(Config * config, char const * section, + char const * variable, gboolean value) { - return config_set(config, "", variable, value ? "1" : "0"); + return config_set(config, section, variable, value ? "1" : "0"); } /* config_save_string */ -static int _config_save_string(Config * config, char const * variable, - char const * value) +static int _config_save_string(Config * config, char const * section, + char const * variable, char const * value) { - return config_set(config, "", variable, value); + return config_set(config, section, variable, value); } diff --git a/src/surfer.h b/src/surfer.h index dec2185..197eaaa 100644 --- a/src/surfer.h +++ b/src/surfer.h @@ -56,6 +56,7 @@ void surfer_set_fullscreen(Surfer * surfer, gboolean fullscreen); void surfer_set_homepage(Surfer * surfer, char const * homepage); void surfer_set_location(Surfer * surfer, char const * url); void surfer_set_progress(Surfer * surfer, gdouble fraction); +void surfer_set_proxy(Surfer * surfer, char const * http); void surfer_set_status(Surfer * surfer, char const * status); void surfer_set_title(Surfer * surfer, char const * title);