From 773e249709d1a6b9f009ced47a44d743e59b3994 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 19 Feb 2011 13:29:39 +0000 Subject: [PATCH] Implemented backward text search --- po/de.po | 102 +++++++++++++++++++++------------------- po/es.po | 102 +++++++++++++++++++++------------------- po/fr.po | 102 +++++++++++++++++++++------------------- po/it.po | 102 +++++++++++++++++++++------------------- src/common.h | 1 + src/ghtml-gtkhtml.c | 2 +- src/ghtml-gtkmozembed.c | 2 +- src/ghtml-gtktextview.c | 4 +- src/ghtml-webkit.c | 4 +- src/ghtml.h | 2 +- src/surfer.c | 16 ++++++- 11 files changed, 236 insertions(+), 203 deletions(-) diff --git a/po/de.po b/po/de.po index c90b921..85ea223 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-02-02 14:46+0100\n" +"POT-Creation-Date: 2011-02-19 14:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:792 -#: ../src/surfer.c:795 ../src/surfer.c:1224 ../src/surfer.c:1229 +#: ../src/surfer.c:795 ../src/surfer.c:1238 ../src/surfer.c:1243 msgid "Question" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:189 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:481 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:558 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -97,99 +97,99 @@ msgstr "" msgid "Download" msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:185 msgid "Address: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:195 msgid "File: " msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:197 msgid "Status: " msgstr "" -#: ../src/download.c:190 +#: ../src/download.c:199 msgid "Done: " msgstr "" -#: ../src/download.c:191 +#: ../src/download.c:200 msgid "0.0 kB" msgstr "" -#: ../src/download.c:192 +#: ../src/download.c:201 msgid "Speed: " msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:202 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:208 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:295 ../src/download.c:300 ../src/download.c:635 +#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "Fehler" -#: ../src/download.c:313 ../src/download.c:339 +#: ../src/download.c:320 ../src/download.c:346 msgid "kB" msgstr "" -#: ../src/download.c:334 ../src/download.c:345 ../src/download.c:364 +#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 msgid "MB" msgstr "" -#: ../src/download.c:336 +#: ../src/download.c:343 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:347 +#: ../src/download.c:354 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:366 +#: ../src/download.c:373 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:489 +#: ../src/download.c:496 msgid "Error " msgstr "Fehler " -#: ../src/download.c:514 ../src/download.c:646 +#: ../src/download.c:521 ../src/download.c:653 msgid "Complete" msgstr "" -#: ../src/download.c:522 ../src/download.c:654 +#: ../src/download.c:529 ../src/download.c:661 msgid "Downloading" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:540 msgid "Redirected to" msgstr "" -#: ../src/download.c:536 +#: ../src/download.c:543 msgid "Redirected" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:550 msgid "Resolved" msgstr "" -#: ../src/download.c:551 +#: ../src/download.c:558 msgid "Code " msgstr "" -#: ../src/download.c:609 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:675 +#: ../src/download.c:682 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -381,7 +381,7 @@ msgstr "Web surfer" msgid " Location: " msgstr "" -#: ../src/surfer.c:383 ../src/surfer.c:1536 ../src/surfer.c:1541 +#: ../src/surfer.c:383 ../src/surfer.c:1550 ../src/surfer.c:1555 msgid "Security information" msgstr "" @@ -389,11 +389,11 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:652 ../src/surfer.c:1140 +#: ../src/surfer.c:652 ../src/surfer.c:1154 msgid "Untitled" msgstr "" -#: ../src/surfer.c:893 ../src/surfer.c:1307 +#: ../src/surfer.c:893 ../src/surfer.c:1321 msgid "Save file as..." msgstr "" @@ -401,71 +401,75 @@ msgstr "" msgid "Find text" msgstr "Suchen" -#: ../src/surfer.c:978 +#: ../src/surfer.c:983 msgid "Text:" msgstr "" -#: ../src/surfer.c:985 +#: ../src/surfer.c:991 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:987 +#: ../src/surfer.c:995 +msgid "Search backwards" +msgstr "" + +#: ../src/surfer.c:998 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1027 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1101 +#: ../src/surfer.c:1115 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1130 +#: ../src/surfer.c:1144 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1368 +#: ../src/surfer.c:1382 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1373 +#: ../src/surfer.c:1387 msgid "Command:" msgstr "" -#: ../src/surfer.c:1392 +#: ../src/surfer.c:1406 msgid "Message" msgstr "" -#: ../src/surfer.c:1397 +#: ../src/surfer.c:1411 msgid "Source" msgstr "" -#: ../src/surfer.c:1402 +#: ../src/surfer.c:1416 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1522 +#: ../src/surfer.c:1536 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1525 +#: ../src/surfer.c:1539 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1529 +#: ../src/surfer.c:1543 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1577 +#: ../src/surfer.c:1591 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1618 ../src/surfer.c:1621 ../src/surfer.c:1676 -#: ../src/surfer.c:1681 +#: ../src/surfer.c:1632 ../src/surfer.c:1635 ../src/surfer.c:1690 +#: ../src/surfer.c:1695 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1680 +#: ../src/surfer.c:1694 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index 4d71a68..a98ef06 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-02-02 14:46+0100\n" +"POT-Creation-Date: 2011-02-19 14:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:792 -#: ../src/surfer.c:795 ../src/surfer.c:1224 ../src/surfer.c:1229 +#: ../src/surfer.c:795 ../src/surfer.c:1238 ../src/surfer.c:1243 msgid "Question" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:189 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:481 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:558 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -97,99 +97,99 @@ msgstr "" msgid "Download" msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:185 msgid "Address: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:195 msgid "File: " msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:197 msgid "Status: " msgstr "" -#: ../src/download.c:190 +#: ../src/download.c:199 msgid "Done: " msgstr "" -#: ../src/download.c:191 +#: ../src/download.c:200 msgid "0.0 kB" msgstr "" -#: ../src/download.c:192 +#: ../src/download.c:201 msgid "Speed: " msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:202 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:208 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:295 ../src/download.c:300 ../src/download.c:635 +#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "" -#: ../src/download.c:313 ../src/download.c:339 +#: ../src/download.c:320 ../src/download.c:346 msgid "kB" msgstr "" -#: ../src/download.c:334 ../src/download.c:345 ../src/download.c:364 +#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 msgid "MB" msgstr "" -#: ../src/download.c:336 +#: ../src/download.c:343 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:347 +#: ../src/download.c:354 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:366 +#: ../src/download.c:373 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:489 +#: ../src/download.c:496 msgid "Error " msgstr "" -#: ../src/download.c:514 ../src/download.c:646 +#: ../src/download.c:521 ../src/download.c:653 msgid "Complete" msgstr "" -#: ../src/download.c:522 ../src/download.c:654 +#: ../src/download.c:529 ../src/download.c:661 msgid "Downloading" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:540 msgid "Redirected to" msgstr "" -#: ../src/download.c:536 +#: ../src/download.c:543 msgid "Redirected" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:550 msgid "Resolved" msgstr "" -#: ../src/download.c:551 +#: ../src/download.c:558 msgid "Code " msgstr "" -#: ../src/download.c:609 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:675 +#: ../src/download.c:682 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -381,7 +381,7 @@ msgstr "Web surfer" msgid " Location: " msgstr "" -#: ../src/surfer.c:383 ../src/surfer.c:1536 ../src/surfer.c:1541 +#: ../src/surfer.c:383 ../src/surfer.c:1550 ../src/surfer.c:1555 msgid "Security information" msgstr "" @@ -389,11 +389,11 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:652 ../src/surfer.c:1140 +#: ../src/surfer.c:652 ../src/surfer.c:1154 msgid "Untitled" msgstr "" -#: ../src/surfer.c:893 ../src/surfer.c:1307 +#: ../src/surfer.c:893 ../src/surfer.c:1321 msgid "Save file as..." msgstr "Guardar como..." @@ -401,71 +401,75 @@ msgstr "Guardar como..." msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:978 +#: ../src/surfer.c:983 msgid "Text:" msgstr "" -#: ../src/surfer.c:985 +#: ../src/surfer.c:991 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:987 +#: ../src/surfer.c:995 +msgid "Search backwards" +msgstr "" + +#: ../src/surfer.c:998 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1027 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1101 +#: ../src/surfer.c:1115 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:1130 +#: ../src/surfer.c:1144 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1368 +#: ../src/surfer.c:1382 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1373 +#: ../src/surfer.c:1387 msgid "Command:" msgstr "" -#: ../src/surfer.c:1392 +#: ../src/surfer.c:1406 msgid "Message" msgstr "" -#: ../src/surfer.c:1397 +#: ../src/surfer.c:1411 msgid "Source" msgstr "" -#: ../src/surfer.c:1402 +#: ../src/surfer.c:1416 msgid "Line" msgstr "" -#: ../src/surfer.c:1522 +#: ../src/surfer.c:1536 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1525 +#: ../src/surfer.c:1539 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1529 +#: ../src/surfer.c:1543 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1577 +#: ../src/surfer.c:1591 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1618 ../src/surfer.c:1621 ../src/surfer.c:1676 -#: ../src/surfer.c:1681 +#: ../src/surfer.c:1632 ../src/surfer.c:1635 ../src/surfer.c:1690 +#: ../src/surfer.c:1695 msgid "Warning" msgstr "" -#: ../src/surfer.c:1680 +#: ../src/surfer.c:1694 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 3b2db75..9e66948 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-02-02 14:46+0100\n" +"POT-Creation-Date: 2011-02-19 14:26+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:792 -#: ../src/surfer.c:795 ../src/surfer.c:1224 ../src/surfer.c:1229 +#: ../src/surfer.c:795 ../src/surfer.c:1238 ../src/surfer.c:1243 msgid "Question" msgstr "Question" @@ -65,11 +65,11 @@ msgstr "Port :" msgid "Network" msgstr "Réseau" -#: ../src/common/conn.c:204 ../src/download.c:189 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:481 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "Connecté" @@ -91,7 +91,7 @@ msgstr "Hôte inconnu" msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:558 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "Délai dépassé" @@ -99,99 +99,99 @@ msgstr "Délai dépassé" msgid "Download" msgstr "Téléchargement" -#: ../src/download.c:184 +#: ../src/download.c:185 msgid "Address: " msgstr "Adresse: " -#: ../src/download.c:186 +#: ../src/download.c:195 msgid "File: " msgstr "Fichier : " -#: ../src/download.c:188 +#: ../src/download.c:197 msgid "Status: " msgstr "Statut : " -#: ../src/download.c:190 +#: ../src/download.c:199 msgid "Done: " msgstr "Fait : " -#: ../src/download.c:191 +#: ../src/download.c:200 msgid "0.0 kB" msgstr "0.0 Kio" -#: ../src/download.c:192 +#: ../src/download.c:201 msgid "Speed: " msgstr "Vitesse : " -#: ../src/download.c:193 +#: ../src/download.c:202 msgid "0.0 kB/s" msgstr "0.0 Kio/s" -#: ../src/download.c:200 +#: ../src/download.c:208 msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" -#: ../src/download.c:295 ../src/download.c:300 ../src/download.c:635 +#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "Erreur" -#: ../src/download.c:313 ../src/download.c:339 +#: ../src/download.c:320 ../src/download.c:346 msgid "kB" msgstr "Kio" -#: ../src/download.c:334 ../src/download.c:345 ../src/download.c:364 +#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 msgid "MB" msgstr "Mo" -#: ../src/download.c:336 +#: ../src/download.c:343 #, c-format msgid "%.1f %s/s" msgstr "%.1f %s/s" -#: ../src/download.c:347 +#: ../src/download.c:354 #, c-format msgid "%.1f %s" msgstr "%.1f %s/s" -#: ../src/download.c:366 +#: ../src/download.c:373 #, c-format msgid "%.1f of %.1f %s" msgstr "%.1f de %.1f %s" -#: ../src/download.c:489 +#: ../src/download.c:496 msgid "Error " msgstr "Erreur " -#: ../src/download.c:514 ../src/download.c:646 +#: ../src/download.c:521 ../src/download.c:653 msgid "Complete" msgstr "Terminé" -#: ../src/download.c:522 ../src/download.c:654 +#: ../src/download.c:529 ../src/download.c:661 msgid "Downloading" msgstr "Téléchargement" -#: ../src/download.c:533 +#: ../src/download.c:540 msgid "Redirected to" msgstr "Redirigé vers" -#: ../src/download.c:536 +#: ../src/download.c:543 msgid "Redirected" msgstr "Redirigé" -#: ../src/download.c:543 +#: ../src/download.c:550 msgid "Resolved" msgstr "Résolu" -#: ../src/download.c:551 +#: ../src/download.c:558 msgid "Code " msgstr "Code " -#: ../src/download.c:609 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/download.c:675 +#: ../src/download.c:682 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -386,7 +386,7 @@ msgstr "Web surfer" msgid " Location: " msgstr " Adresse: " -#: ../src/surfer.c:383 ../src/surfer.c:1536 ../src/surfer.c:1541 +#: ../src/surfer.c:383 ../src/surfer.c:1550 ../src/surfer.c:1555 msgid "Security information" msgstr "Informations de sécurité" @@ -394,11 +394,11 @@ msgstr "Informations de sécurité" msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:652 ../src/surfer.c:1140 +#: ../src/surfer.c:652 ../src/surfer.c:1154 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:893 ../src/surfer.c:1307 +#: ../src/surfer.c:893 ../src/surfer.c:1321 msgid "Save file as..." msgstr "Enregistrer sous..." @@ -406,71 +406,75 @@ msgstr "Enregistrer sous..." msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:978 +#: ../src/surfer.c:983 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:985 +#: ../src/surfer.c:991 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:987 +#: ../src/surfer.c:995 +msgid "Search backwards" +msgstr "Inverser le sens de la recherche" + +#: ../src/surfer.c:998 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1027 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:1101 +#: ../src/surfer.c:1115 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:1130 +#: ../src/surfer.c:1144 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1368 +#: ../src/surfer.c:1382 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1373 +#: ../src/surfer.c:1387 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1392 +#: ../src/surfer.c:1406 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1397 +#: ../src/surfer.c:1411 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1402 +#: ../src/surfer.c:1416 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1522 +#: ../src/surfer.c:1536 msgid "This connection is encrypted and trusted." msgstr "Cette connexion est chiffrée et de confiance." -#: ../src/surfer.c:1525 +#: ../src/surfer.c:1539 msgid "This connection is encrypted but not trusted." msgstr "Cette connexion est chiffrée mais pas de confiance." -#: ../src/surfer.c:1529 +#: ../src/surfer.c:1543 msgid "This connection is not encrypted." msgstr "Cette connexion n'est pas chiffrée." -#: ../src/surfer.c:1577 +#: ../src/surfer.c:1591 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1618 ../src/surfer.c:1621 ../src/surfer.c:1676 -#: ../src/surfer.c:1681 +#: ../src/surfer.c:1632 ../src/surfer.c:1635 ../src/surfer.c:1690 +#: ../src/surfer.c:1695 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1680 +#: ../src/surfer.c:1694 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 b6e2da3..2d4828f 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-02-02 14:46+0100\n" +"POT-Creation-Date: 2011-02-19 14:26+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:792 -#: ../src/surfer.c:795 ../src/surfer.c:1224 ../src/surfer.c:1229 +#: ../src/surfer.c:795 ../src/surfer.c:1238 ../src/surfer.c:1243 msgid "Question" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:189 ../src/ghtml-gtkhtml.c:876 +#: ../src/common/conn.c:204 ../src/download.c:198 ../src/ghtml-gtkhtml.c:876 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:481 ../src/ghtml-gtkhtml.c:926 +#: ../src/common/conn.c:253 ../src/download.c:488 ../src/ghtml-gtkhtml.c:926 msgid "Connected" msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:558 ../src/ghtml-gtkhtml.c:1112 +#: ../src/common/conn.c:348 ../src/download.c:565 ../src/ghtml-gtkhtml.c:1112 msgid "Timeout" msgstr "" @@ -97,99 +97,99 @@ msgstr "" msgid "Download" msgstr "" -#: ../src/download.c:184 +#: ../src/download.c:185 msgid "Address: " msgstr "" -#: ../src/download.c:186 +#: ../src/download.c:195 msgid "File: " msgstr "" -#: ../src/download.c:188 +#: ../src/download.c:197 msgid "Status: " msgstr "" -#: ../src/download.c:190 +#: ../src/download.c:199 msgid "Done: " msgstr "" -#: ../src/download.c:191 +#: ../src/download.c:200 msgid "0.0 kB" msgstr "" -#: ../src/download.c:192 +#: ../src/download.c:201 msgid "Speed: " msgstr "" -#: ../src/download.c:193 +#: ../src/download.c:202 msgid "0.0 kB/s" msgstr "" -#: ../src/download.c:200 +#: ../src/download.c:208 msgid "Close window when the download is complete" msgstr "" -#: ../src/download.c:295 ../src/download.c:300 ../src/download.c:635 +#: ../src/download.c:302 ../src/download.c:307 ../src/download.c:642 #: ../src/surfer.c:940 ../src/surfer.c:943 msgid "Error" msgstr "" -#: ../src/download.c:313 ../src/download.c:339 +#: ../src/download.c:320 ../src/download.c:346 msgid "kB" msgstr "" -#: ../src/download.c:334 ../src/download.c:345 ../src/download.c:364 +#: ../src/download.c:341 ../src/download.c:352 ../src/download.c:371 msgid "MB" msgstr "" -#: ../src/download.c:336 +#: ../src/download.c:343 #, c-format msgid "%.1f %s/s" msgstr "" -#: ../src/download.c:347 +#: ../src/download.c:354 #, c-format msgid "%.1f %s" msgstr "" -#: ../src/download.c:366 +#: ../src/download.c:373 #, c-format msgid "%.1f of %.1f %s" msgstr "" -#: ../src/download.c:489 +#: ../src/download.c:496 msgid "Error " msgstr "" -#: ../src/download.c:514 ../src/download.c:646 +#: ../src/download.c:521 ../src/download.c:653 msgid "Complete" msgstr "" -#: ../src/download.c:522 ../src/download.c:654 +#: ../src/download.c:529 ../src/download.c:661 msgid "Downloading" msgstr "" -#: ../src/download.c:533 +#: ../src/download.c:540 msgid "Redirected to" msgstr "" -#: ../src/download.c:536 +#: ../src/download.c:543 msgid "Redirected" msgstr "" -#: ../src/download.c:543 +#: ../src/download.c:550 msgid "Resolved" msgstr "" -#: ../src/download.c:551 +#: ../src/download.c:558 msgid "Code " msgstr "" -#: ../src/download.c:609 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 +#: ../src/download.c:616 ../src/ghtml-webkit.c:673 ../src/surfer.c:942 msgid "Unknown error" msgstr "" -#: ../src/download.c:675 +#: ../src/download.c:682 msgid "" "Usage: download [-O output][-U user-agent] URL...\n" " -O\tFile to write document to\n" @@ -381,7 +381,7 @@ msgstr "" msgid " Location: " msgstr "" -#: ../src/surfer.c:383 ../src/surfer.c:1536 ../src/surfer.c:1541 +#: ../src/surfer.c:383 ../src/surfer.c:1550 ../src/surfer.c:1555 msgid "Security information" msgstr "" @@ -389,11 +389,11 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:652 ../src/surfer.c:1140 +#: ../src/surfer.c:652 ../src/surfer.c:1154 msgid "Untitled" msgstr "" -#: ../src/surfer.c:893 ../src/surfer.c:1307 +#: ../src/surfer.c:893 ../src/surfer.c:1321 msgid "Save file as..." msgstr "" @@ -401,71 +401,75 @@ msgstr "" msgid "Find text" msgstr "" -#: ../src/surfer.c:978 +#: ../src/surfer.c:983 msgid "Text:" msgstr "" -#: ../src/surfer.c:985 +#: ../src/surfer.c:991 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:987 +#: ../src/surfer.c:995 +msgid "Search backwards" +msgstr "" + +#: ../src/surfer.c:998 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1027 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1101 +#: ../src/surfer.c:1115 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1130 +#: ../src/surfer.c:1144 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1368 +#: ../src/surfer.c:1382 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1373 +#: ../src/surfer.c:1387 msgid "Command:" msgstr "" -#: ../src/surfer.c:1392 +#: ../src/surfer.c:1406 msgid "Message" msgstr "" -#: ../src/surfer.c:1397 +#: ../src/surfer.c:1411 msgid "Source" msgstr "" -#: ../src/surfer.c:1402 +#: ../src/surfer.c:1416 msgid "Line" msgstr "" -#: ../src/surfer.c:1522 +#: ../src/surfer.c:1536 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1525 +#: ../src/surfer.c:1539 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1529 +#: ../src/surfer.c:1543 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1577 +#: ../src/surfer.c:1591 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1618 ../src/surfer.c:1621 ../src/surfer.c:1676 -#: ../src/surfer.c:1681 +#: ../src/surfer.c:1632 ../src/surfer.c:1635 ../src/surfer.c:1690 +#: ../src/surfer.c:1695 msgid "Warning" msgstr "" -#: ../src/surfer.c:1680 +#: ../src/surfer.c:1694 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/common.h b/src/common.h index 8109582..169f600 100644 --- a/src/common.h +++ b/src/common.h @@ -68,6 +68,7 @@ struct _Surfer GtkWidget * fi_dialog; GtkWidget * fi_text; GtkWidget * fi_case; + GtkWidget * fi_back; GtkWidget * fi_wrap; /* console */ diff --git a/src/ghtml-gtkhtml.c b/src/ghtml-gtkhtml.c index 8f2fdd6..d8a8dc5 100644 --- a/src/ghtml-gtkhtml.c +++ b/src/ghtml-gtkhtml.c @@ -314,7 +314,7 @@ void ghtml_execute(GtkWidget * ghtml, char const * code) /* ghtml_find */ gboolean ghtml_find(GtkWidget * ghtml, char const * text, gboolean sensitive, - gboolean wrap) + gboolean backwards, gboolean wrap) { /* FIXME implement */ return FALSE; diff --git a/src/ghtml-gtkmozembed.c b/src/ghtml-gtkmozembed.c index d87777c..2471d45 100644 --- a/src/ghtml-gtkmozembed.c +++ b/src/ghtml-gtkmozembed.c @@ -435,7 +435,7 @@ void ghtml_execute(GtkWidget * ghtml, char const * code) /* ghtml_find */ gboolean ghtml_find(GtkWidget * ghtml, char const * text, gboolean sensitive, - gboolean wrap) + gboolean backwards, gboolean wrap) { /* FIXME implement */ return FALSE; diff --git a/src/ghtml-gtktextview.c b/src/ghtml-gtktextview.c index 9fe9b9a..9d25a6f 100644 --- a/src/ghtml-gtktextview.c +++ b/src/ghtml-gtktextview.c @@ -12,6 +12,8 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +/* TODO: + * - implement backwards text search */ @@ -485,7 +487,7 @@ static gboolean _find_match(GHtml * ghtml, char const * buf, char const * str, size_t tlen); gboolean ghtml_find(GtkWidget * widget, char const * text, gboolean sensitive, - gboolean wrap) + gboolean backwards, gboolean wrap) { gboolean ret = FALSE; GHtml * ghtml; diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c index c7da136..14c436f 100644 --- a/src/ghtml-webkit.c +++ b/src/ghtml-webkit.c @@ -382,13 +382,13 @@ void ghtml_execute(GtkWidget * widget, char const * code) /* ghtml_find */ gboolean ghtml_find(GtkWidget * widget, char const * text, gboolean sensitive, - gboolean wrap) + gboolean backwards, gboolean wrap) { GHtml * ghtml; ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); return webkit_web_view_search_text(WEBKIT_WEB_VIEW(ghtml->view), text, - sensitive, TRUE, wrap); + sensitive, !backwards, wrap); } diff --git a/src/ghtml.h b/src/ghtml.h index 815f562..c5b7cf9 100644 --- a/src/ghtml.h +++ b/src/ghtml.h @@ -58,7 +58,7 @@ void ghtml_select_all(GtkWidget * ghtml); void ghtml_unselect_all(GtkWidget * ghtml); gboolean ghtml_find(GtkWidget * ghtml, char const * text, gboolean sensitive, - gboolean wrap); + gboolean backwards, gboolean wrap); void ghtml_redo(GtkWidget * ghtml); void ghtml_undo(GtkWidget * ghtml); diff --git a/src/surfer.c b/src/surfer.c index d7810e5..b91e26a 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -973,7 +973,12 @@ static void _find_dialog(Surfer * surfer) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_FIND, GTK_RESPONSE_ACCEPT, NULL); +#if GTK_CHECK_VERSION(2, 14, 0) + vbox = gtk_dialog_get_content_area(GTK_DIALOG(surfer->fi_dialog)); +#else vbox = GTK_DIALOG(surfer->fi_dialog)->vbox; +#endif + /* text */ hbox = gtk_hbox_new(FALSE, 0); widget = gtk_label_new(_("Text:")); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); @@ -982,8 +987,14 @@ static void _find_dialog(Surfer * surfer) _on_find_activate), surfer); gtk_box_pack_start(GTK_BOX(hbox), surfer->fi_text, TRUE, TRUE, 4); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 4); + /* case-sensitive */ surfer->fi_case = gtk_check_button_new_with_label(_("Case-sensitive")); gtk_box_pack_start(GTK_BOX(vbox), surfer->fi_case, TRUE, TRUE, 4); + /* search backwards */ + surfer->fi_back = gtk_check_button_new_with_label( + _("Search backwards")); + gtk_box_pack_start(GTK_BOX(vbox), surfer->fi_back, TRUE, TRUE, 4); + /* wrap */ surfer->fi_wrap = gtk_check_button_new_with_label(_("Wrap")); gtk_box_pack_start(GTK_BOX(vbox), surfer->fi_wrap, TRUE, TRUE, 4); gtk_widget_show_all(vbox); @@ -997,6 +1008,7 @@ static void _on_find_activate(GtkWidget * widget, gpointer data) GtkWidget * view; char const * text; gboolean sensitive; + gboolean backwards; gboolean wrap; if((view = surfer_get_view(surfer)) == NULL) @@ -1006,9 +1018,11 @@ static void _on_find_activate(GtkWidget * widget, gpointer data) return; sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( surfer->fi_case)); + backwards = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + surfer->fi_back)); wrap = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( surfer->fi_wrap)); - if(ghtml_find(view, text, sensitive, wrap) == TRUE) + if(ghtml_find(view, text, sensitive, backwards, wrap) == TRUE) return; surfer_error(surfer, _("Text not found"), 0); }