From 4fa2e30e49df4b48b75a6336541f6eb3f71bff35 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 21 Dec 2010 03:34:17 +0000 Subject: [PATCH] Implemented undo/redo with WebKit --- po/de.po | 174 +++++++++++++++++++++------------------- po/es.po | 174 +++++++++++++++++++++------------------- po/fr.po | 168 ++++++++++++++++++++------------------ po/it.po | 174 +++++++++++++++++++++------------------- src/callbacks.c | 18 +++++ src/callbacks.h | 2 + src/ghtml-gtkhtml.c | 14 ++++ src/ghtml-gtkmozembed.c | 14 ++++ src/ghtml-gtktextview.c | 14 ++++ src/ghtml-webkit.c | 26 +++++- src/ghtml.h | 3 + src/surfer.c | 27 +++++++ src/surfer.h | 4 + 13 files changed, 482 insertions(+), 330 deletions(-) diff --git a/po/de.po b/po/de.po index 682c4ea..4196806 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-21 04:13+0100\n" +"POT-Creation-Date: 2010-12-21 04:33+0100\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:779 -#: ../src/surfer.c:782 ../src/surfer.c:1169 ../src/surfer.c:1174 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:784 +#: ../src/surfer.c:787 ../src/surfer.c:1174 ../src/surfer.c:1179 msgid "Question" msgstr "" @@ -27,69 +27,69 @@ msgid "" "Do you really want to close every tab opened in this window?" msgstr "" -#: ../src/callbacks.c:452 +#: ../src/callbacks.c:470 msgid "Web surfer preferences" msgstr "Web surfer Einstellungen" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:490 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:480 +#: ../src/callbacks.c:498 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:484 +#: ../src/callbacks.c:502 msgid "General" msgstr "" -#: ../src/callbacks.c:488 +#: ../src/callbacks.c:506 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:492 +#: ../src/callbacks.c:510 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:499 +#: ../src/callbacks.c:517 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:503 +#: ../src/callbacks.c:521 msgid "Port:" msgstr "" -#: ../src/callbacks.c:511 +#: ../src/callbacks.c:529 msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:841 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:855 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:891 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:905 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:926 -#: ../src/ghtml-webkit.c:513 ../src/ghtml-webkit.c:654 -#: ../src/ghtml-webkit.c:666 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:940 +#: ../src/ghtml-webkit.c:537 ../src/ghtml-webkit.c:678 +#: ../src/ghtml-webkit.c:690 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:972 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:986 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:976 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:990 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:981 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:995 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1077 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1091 msgid "Timeout" msgstr "" @@ -126,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:899 ../src/surfer.c:902 +#: ../src/surfer.c:904 ../src/surfer.c:907 msgid "Error" msgstr "Fehler" @@ -181,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:612 ../src/surfer.c:901 +#: ../src/download.c:605 ../src/ghtml-webkit.c:636 ../src/surfer.c:906 msgid "Unknown error" msgstr "" @@ -192,32 +192,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:718 +#: ../src/ghtml-gtkhtml.c:732 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:784 +#: ../src/ghtml-gtkhtml.c:798 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:996 +#: ../src/ghtml-gtkhtml.c:1010 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1004 +#: ../src/ghtml-gtkhtml.c:1018 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1038 ../src/ghtml-webkit.c:408 -#: ../src/ghtml-webkit.c:511 +#: ../src/ghtml-gtkhtml.c:1052 ../src/ghtml-webkit.c:408 +#: ../src/ghtml-webkit.c:535 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1041 +#: ../src/ghtml-gtkhtml.c:1055 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1199 +#: ../src/ghtml-gtkhtml.c:1213 msgid "Unsupported method" msgstr "" @@ -258,198 +258,206 @@ msgid "_Close" msgstr "" #: ../src/surfer.c:128 -msgid "_Cut" -msgstr "" - -#: ../src/surfer.c:129 -msgid "Cop_y" +msgid "_Undo" msgstr "" #: ../src/surfer.c:130 -msgid "_Paste" +msgid "_Redo" msgstr "" #: ../src/surfer.c:133 +msgid "_Cut" +msgstr "" + +#: ../src/surfer.c:134 +msgid "Cop_y" +msgstr "" + +#: ../src/surfer.c:135 +msgid "_Paste" +msgstr "" + +#: ../src/surfer.c:138 msgid "Select _all" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:145 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:142 +#: ../src/surfer.c:147 msgid "_Find" msgstr "" -#: ../src/surfer.c:145 +#: ../src/surfer.c:150 msgid "_Preferences" msgstr "" -#: ../src/surfer.c:152 ../src/surfer.c:207 +#: ../src/surfer.c:157 ../src/surfer.c:212 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:154 ../src/surfer.c:208 +#: ../src/surfer.c:159 ../src/surfer.c:213 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:156 ../src/surfer.c:209 +#: ../src/surfer.c:161 ../src/surfer.c:214 msgid "Normal size" msgstr "" -#: ../src/surfer.c:159 +#: ../src/surfer.c:164 msgid "_Refresh" msgstr "" -#: ../src/surfer.c:161 +#: ../src/surfer.c:166 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:163 +#: ../src/surfer.c:168 msgid "_Stop" msgstr "" -#: ../src/surfer.c:166 +#: ../src/surfer.c:171 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:168 +#: ../src/surfer.c:173 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:175 +#: ../src/surfer.c:180 msgid "_About" msgstr "" -#: ../src/surfer.c:186 +#: ../src/surfer.c:191 msgid "_File" msgstr "" -#: ../src/surfer.c:187 +#: ../src/surfer.c:192 msgid "_Edit" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:193 msgid "_View" msgstr "" -#: ../src/surfer.c:189 +#: ../src/surfer.c:194 msgid "_Help" msgstr "" -#: ../src/surfer.c:196 +#: ../src/surfer.c:201 msgid "Back" msgstr "" -#: ../src/surfer.c:198 +#: ../src/surfer.c:203 msgid "Forward" msgstr "" -#: ../src/surfer.c:200 +#: ../src/surfer.c:205 msgid "Stop" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:206 msgid "Refresh" msgstr "" -#: ../src/surfer.c:204 +#: ../src/surfer.c:209 msgid "Home" msgstr "" -#: ../src/surfer.c:292 ../src/surfer.c:626 +#: ../src/surfer.c:297 ../src/surfer.c:631 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:340 +#: ../src/surfer.c:345 msgid " Location: " msgstr "" -#: ../src/surfer.c:596 +#: ../src/surfer.c:601 msgid "Ready" msgstr "" -#: ../src/surfer.c:639 ../src/surfer.c:1099 +#: ../src/surfer.c:644 ../src/surfer.c:1104 msgid "Untitled" msgstr "" -#: ../src/surfer.c:852 ../src/surfer.c:1241 +#: ../src/surfer.c:857 ../src/surfer.c:1257 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:930 +#: ../src/surfer.c:935 msgid "Find text" msgstr "Suchen" -#: ../src/surfer.c:937 +#: ../src/surfer.c:942 msgid "Text:" msgstr "" -#: ../src/surfer.c:944 +#: ../src/surfer.c:949 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:946 +#: ../src/surfer.c:951 msgid "Wrap" msgstr "" -#: ../src/surfer.c:972 +#: ../src/surfer.c:977 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1060 +#: ../src/surfer.c:1065 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1089 +#: ../src/surfer.c:1094 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1302 +#: ../src/surfer.c:1318 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1307 +#: ../src/surfer.c:1323 msgid "Command:" msgstr "" -#: ../src/surfer.c:1326 +#: ../src/surfer.c:1342 msgid "Message" msgstr "" -#: ../src/surfer.c:1331 +#: ../src/surfer.c:1347 msgid "Source" msgstr "" -#: ../src/surfer.c:1336 +#: ../src/surfer.c:1352 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1445 +#: ../src/surfer.c:1472 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1448 +#: ../src/surfer.c:1475 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1479 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1459 ../src/surfer.c:1464 +#: ../src/surfer.c:1486 ../src/surfer.c:1491 msgid "Security" msgstr "" -#: ../src/surfer.c:1500 +#: ../src/surfer.c:1527 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1541 ../src/surfer.c:1544 ../src/surfer.c:1599 -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1568 ../src/surfer.c:1571 ../src/surfer.c:1626 +#: ../src/surfer.c:1631 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1603 +#: ../src/surfer.c:1630 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index cde10b1..330ca80 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-21 04:13+0100\n" +"POT-Creation-Date: 2010-12-21 04:33+0100\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:779 -#: ../src/surfer.c:782 ../src/surfer.c:1169 ../src/surfer.c:1174 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:784 +#: ../src/surfer.c:787 ../src/surfer.c:1174 ../src/surfer.c:1179 msgid "Question" msgstr "" @@ -27,69 +27,69 @@ msgid "" "Do you really want to close every tab opened in this window?" msgstr "" -#: ../src/callbacks.c:452 +#: ../src/callbacks.c:470 msgid "Web surfer preferences" msgstr "Web surfer preferencias" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:490 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:480 +#: ../src/callbacks.c:498 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:484 +#: ../src/callbacks.c:502 msgid "General" msgstr "" -#: ../src/callbacks.c:488 +#: ../src/callbacks.c:506 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:492 +#: ../src/callbacks.c:510 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:499 +#: ../src/callbacks.c:517 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:503 +#: ../src/callbacks.c:521 msgid "Port:" msgstr "" -#: ../src/callbacks.c:511 +#: ../src/callbacks.c:529 msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:841 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:855 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:891 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:905 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:926 -#: ../src/ghtml-webkit.c:513 ../src/ghtml-webkit.c:654 -#: ../src/ghtml-webkit.c:666 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:940 +#: ../src/ghtml-webkit.c:537 ../src/ghtml-webkit.c:678 +#: ../src/ghtml-webkit.c:690 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:972 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:986 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:976 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:990 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:981 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:995 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1077 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1091 msgid "Timeout" msgstr "" @@ -126,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:899 ../src/surfer.c:902 +#: ../src/surfer.c:904 ../src/surfer.c:907 msgid "Error" msgstr "" @@ -181,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:612 ../src/surfer.c:901 +#: ../src/download.c:605 ../src/ghtml-webkit.c:636 ../src/surfer.c:906 msgid "Unknown error" msgstr "" @@ -192,32 +192,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:718 +#: ../src/ghtml-gtkhtml.c:732 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:784 +#: ../src/ghtml-gtkhtml.c:798 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:996 +#: ../src/ghtml-gtkhtml.c:1010 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1004 +#: ../src/ghtml-gtkhtml.c:1018 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1038 ../src/ghtml-webkit.c:408 -#: ../src/ghtml-webkit.c:511 +#: ../src/ghtml-gtkhtml.c:1052 ../src/ghtml-webkit.c:408 +#: ../src/ghtml-webkit.c:535 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1041 +#: ../src/ghtml-gtkhtml.c:1055 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1199 +#: ../src/ghtml-gtkhtml.c:1213 msgid "Unsupported method" msgstr "" @@ -258,198 +258,206 @@ msgid "_Close" msgstr "" #: ../src/surfer.c:128 -msgid "_Cut" -msgstr "" - -#: ../src/surfer.c:129 -msgid "Cop_y" +msgid "_Undo" msgstr "" #: ../src/surfer.c:130 -msgid "_Paste" +msgid "_Redo" msgstr "" #: ../src/surfer.c:133 +msgid "_Cut" +msgstr "" + +#: ../src/surfer.c:134 +msgid "Cop_y" +msgstr "" + +#: ../src/surfer.c:135 +msgid "_Paste" +msgstr "" + +#: ../src/surfer.c:138 msgid "Select _all" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:145 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:142 +#: ../src/surfer.c:147 msgid "_Find" msgstr "" -#: ../src/surfer.c:145 +#: ../src/surfer.c:150 msgid "_Preferences" msgstr "" -#: ../src/surfer.c:152 ../src/surfer.c:207 +#: ../src/surfer.c:157 ../src/surfer.c:212 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:154 ../src/surfer.c:208 +#: ../src/surfer.c:159 ../src/surfer.c:213 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:156 ../src/surfer.c:209 +#: ../src/surfer.c:161 ../src/surfer.c:214 msgid "Normal size" msgstr "" -#: ../src/surfer.c:159 +#: ../src/surfer.c:164 msgid "_Refresh" msgstr "" -#: ../src/surfer.c:161 +#: ../src/surfer.c:166 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:163 +#: ../src/surfer.c:168 msgid "_Stop" msgstr "" -#: ../src/surfer.c:166 +#: ../src/surfer.c:171 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:168 +#: ../src/surfer.c:173 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:175 +#: ../src/surfer.c:180 msgid "_About" msgstr "" -#: ../src/surfer.c:186 +#: ../src/surfer.c:191 msgid "_File" msgstr "" -#: ../src/surfer.c:187 +#: ../src/surfer.c:192 msgid "_Edit" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:193 msgid "_View" msgstr "" -#: ../src/surfer.c:189 +#: ../src/surfer.c:194 msgid "_Help" msgstr "" -#: ../src/surfer.c:196 +#: ../src/surfer.c:201 msgid "Back" msgstr "" -#: ../src/surfer.c:198 +#: ../src/surfer.c:203 msgid "Forward" msgstr "" -#: ../src/surfer.c:200 +#: ../src/surfer.c:205 msgid "Stop" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:206 msgid "Refresh" msgstr "" -#: ../src/surfer.c:204 +#: ../src/surfer.c:209 msgid "Home" msgstr "" -#: ../src/surfer.c:292 ../src/surfer.c:626 +#: ../src/surfer.c:297 ../src/surfer.c:631 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:340 +#: ../src/surfer.c:345 msgid " Location: " msgstr "" -#: ../src/surfer.c:596 +#: ../src/surfer.c:601 msgid "Ready" msgstr "" -#: ../src/surfer.c:639 ../src/surfer.c:1099 +#: ../src/surfer.c:644 ../src/surfer.c:1104 msgid "Untitled" msgstr "" -#: ../src/surfer.c:852 ../src/surfer.c:1241 +#: ../src/surfer.c:857 ../src/surfer.c:1257 msgid "Save file as..." msgstr "Guardar como..." -#: ../src/surfer.c:930 +#: ../src/surfer.c:935 msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:937 +#: ../src/surfer.c:942 msgid "Text:" msgstr "" -#: ../src/surfer.c:944 +#: ../src/surfer.c:949 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:946 +#: ../src/surfer.c:951 msgid "Wrap" msgstr "" -#: ../src/surfer.c:972 +#: ../src/surfer.c:977 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1060 +#: ../src/surfer.c:1065 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:1089 +#: ../src/surfer.c:1094 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1302 +#: ../src/surfer.c:1318 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1307 +#: ../src/surfer.c:1323 msgid "Command:" msgstr "" -#: ../src/surfer.c:1326 +#: ../src/surfer.c:1342 msgid "Message" msgstr "" -#: ../src/surfer.c:1331 +#: ../src/surfer.c:1347 msgid "Source" msgstr "" -#: ../src/surfer.c:1336 +#: ../src/surfer.c:1352 msgid "Line" msgstr "" -#: ../src/surfer.c:1445 +#: ../src/surfer.c:1472 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1448 +#: ../src/surfer.c:1475 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1479 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1459 ../src/surfer.c:1464 +#: ../src/surfer.c:1486 ../src/surfer.c:1491 msgid "Security" msgstr "" -#: ../src/surfer.c:1500 +#: ../src/surfer.c:1527 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1541 ../src/surfer.c:1544 ../src/surfer.c:1599 -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1568 ../src/surfer.c:1571 ../src/surfer.c:1626 +#: ../src/surfer.c:1631 msgid "Warning" msgstr "" -#: ../src/surfer.c:1603 +#: ../src/surfer.c:1630 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 976f2a1..5f3110a 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-21 04:13+0100\n" +"POT-Creation-Date: 2010-12-21 04:33+0100\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:779 -#: ../src/surfer.c:782 ../src/surfer.c:1169 ../src/surfer.c:1174 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:784 +#: ../src/surfer.c:787 ../src/surfer.c:1174 ../src/surfer.c:1179 msgid "Question" msgstr "Question" @@ -29,69 +29,69 @@ msgstr "" "Plusieurs onglets sont ouverts.\n" "Voulez-vous vraiment fermer tous les onglets de cette fenêtre ?" -#: ../src/callbacks.c:452 +#: ../src/callbacks.c:470 msgid "Web surfer preferences" msgstr "Préférences de Web surfer" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:490 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../src/callbacks.c:480 +#: ../src/callbacks.c:498 msgid "Focus new tabs" msgstr "Focaliser les nouveaux onglets" -#: ../src/callbacks.c:484 +#: ../src/callbacks.c:502 msgid "General" msgstr "Général" -#: ../src/callbacks.c:488 +#: ../src/callbacks.c:506 msgid "Direct connection" msgstr "Connexion directe" -#: ../src/callbacks.c:492 +#: ../src/callbacks.c:510 msgid "HTTP proxy:" msgstr "Proxy HTTP :" -#: ../src/callbacks.c:499 +#: ../src/callbacks.c:517 msgid "Hostname:" msgstr "Hôte :" -#: ../src/callbacks.c:503 +#: ../src/callbacks.c:521 msgid "Port:" msgstr "Port :" -#: ../src/callbacks.c:511 +#: ../src/callbacks.c:529 msgid "Network" msgstr "Réseau" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:841 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:855 msgid "Resolving..." msgstr "Résolution du domaine..." -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:891 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:905 msgid "Connected" msgstr "Connecté" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:926 -#: ../src/ghtml-webkit.c:513 ../src/ghtml-webkit.c:654 -#: ../src/ghtml-webkit.c:666 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:940 +#: ../src/ghtml-webkit.c:537 ../src/ghtml-webkit.c:678 +#: ../src/ghtml-webkit.c:690 msgid "Downloading..." msgstr "Téléchargement..." -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:972 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:986 msgid "Unsupported protocol" msgstr "Protocole non supporté" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:976 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:990 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:981 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:995 msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1077 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1091 msgid "Timeout" msgstr "Délai dépassé" @@ -128,7 +128,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:631 -#: ../src/surfer.c:899 ../src/surfer.c:902 +#: ../src/surfer.c:904 ../src/surfer.c:907 msgid "Error" msgstr "Erreur" @@ -183,7 +183,7 @@ msgstr "Résolu" msgid "Code " msgstr "Code " -#: ../src/download.c:605 ../src/ghtml-webkit.c:612 ../src/surfer.c:901 +#: ../src/download.c:605 ../src/ghtml-webkit.c:636 ../src/surfer.c:906 msgid "Unknown error" msgstr "Erreur inconnue" @@ -197,32 +197,32 @@ msgstr "" " -O\tfichier de destination\n" " -U\tuser-agent à utiliser\n" -#: ../src/ghtml-gtkhtml.c:718 +#: ../src/ghtml-gtkhtml.c:732 msgid "Unknown protocol" msgstr "Protocole inconnu" -#: ../src/ghtml-gtkhtml.c:784 +#: ../src/ghtml-gtkhtml.c:798 msgid "Reading file..." msgstr "Lecture du fichier..." -#: ../src/ghtml-gtkhtml.c:996 +#: ../src/ghtml-gtkhtml.c:1010 msgid "Redirecting..." msgstr "Redirection..." -#: ../src/ghtml-gtkhtml.c:1004 +#: ../src/ghtml-gtkhtml.c:1018 msgid "Redirecting to " msgstr "Redirection vers " -#: ../src/ghtml-gtkhtml.c:1038 ../src/ghtml-webkit.c:408 -#: ../src/ghtml-webkit.c:511 +#: ../src/ghtml-gtkhtml.c:1052 ../src/ghtml-webkit.c:408 +#: ../src/ghtml-webkit.c:535 msgid "Connecting..." msgstr "Connexion..." -#: ../src/ghtml-gtkhtml.c:1041 +#: ../src/ghtml-gtkhtml.c:1055 msgid "Connecting to " msgstr "Connexion à " -#: ../src/ghtml-gtkhtml.c:1199 +#: ../src/ghtml-gtkhtml.c:1213 msgid "Unsupported method" msgstr "Méthode non supportée" @@ -263,198 +263,206 @@ msgid "_Close" msgstr "F_ermer" #: ../src/surfer.c:128 +msgid "_Undo" +msgstr "A_nnuler" + +#: ../src/surfer.c:130 +msgid "_Redo" +msgstr "_Rétablir" + +#: ../src/surfer.c:133 msgid "_Cut" msgstr "Co_uper" -#: ../src/surfer.c:129 +#: ../src/surfer.c:134 msgid "Cop_y" msgstr "_Copier" -#: ../src/surfer.c:130 +#: ../src/surfer.c:135 msgid "_Paste" msgstr "C_oller" -#: ../src/surfer.c:133 +#: ../src/surfer.c:138 msgid "Select _all" msgstr "_Sélectionner tout" -#: ../src/surfer.c:140 +#: ../src/surfer.c:145 msgid "_Unselect all" msgstr "Tout _désélectionner" -#: ../src/surfer.c:142 +#: ../src/surfer.c:147 msgid "_Find" msgstr "Rechercher" -#: ../src/surfer.c:145 +#: ../src/surfer.c:150 msgid "_Preferences" msgstr "_Préférences" -#: ../src/surfer.c:152 ../src/surfer.c:207 +#: ../src/surfer.c:157 ../src/surfer.c:212 msgid "Zoom in" msgstr "Zoom +" -#: ../src/surfer.c:154 ../src/surfer.c:208 +#: ../src/surfer.c:159 ../src/surfer.c:213 msgid "Zoom out" msgstr "Zoom -" -#: ../src/surfer.c:156 ../src/surfer.c:209 +#: ../src/surfer.c:161 ../src/surfer.c:214 msgid "Normal size" msgstr "Taille normale" -#: ../src/surfer.c:159 +#: ../src/surfer.c:164 msgid "_Refresh" msgstr "_Actualiser" -#: ../src/surfer.c:161 +#: ../src/surfer.c:166 msgid "_Force refresh" msgstr "Actualisation forcée" -#: ../src/surfer.c:163 +#: ../src/surfer.c:168 msgid "_Stop" msgstr "Arrêter" -#: ../src/surfer.c:166 +#: ../src/surfer.c:171 msgid "Javascript _console" msgstr "_Console Javascript" -#: ../src/surfer.c:168 +#: ../src/surfer.c:173 msgid "Page so_urce" msgstr "So_urce de la page" -#: ../src/surfer.c:175 +#: ../src/surfer.c:180 msgid "_About" msgstr "À _propos" -#: ../src/surfer.c:186 +#: ../src/surfer.c:191 msgid "_File" msgstr "_Fichier" -#: ../src/surfer.c:187 +#: ../src/surfer.c:192 msgid "_Edit" msgstr "É_dition" -#: ../src/surfer.c:188 +#: ../src/surfer.c:193 msgid "_View" msgstr "_Vue" -#: ../src/surfer.c:189 +#: ../src/surfer.c:194 msgid "_Help" msgstr "_Aide" -#: ../src/surfer.c:196 +#: ../src/surfer.c:201 msgid "Back" msgstr "Précédent" -#: ../src/surfer.c:198 +#: ../src/surfer.c:203 msgid "Forward" msgstr "Suivant" -#: ../src/surfer.c:200 +#: ../src/surfer.c:205 msgid "Stop" msgstr "Arrêter" -#: ../src/surfer.c:201 +#: ../src/surfer.c:206 msgid "Refresh" msgstr "Actualiser" -#: ../src/surfer.c:204 +#: ../src/surfer.c:209 msgid "Home" msgstr "Page d'accueil" -#: ../src/surfer.c:292 ../src/surfer.c:626 +#: ../src/surfer.c:297 ../src/surfer.c:631 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:340 +#: ../src/surfer.c:345 msgid " Location: " msgstr " Adresse: " -#: ../src/surfer.c:596 +#: ../src/surfer.c:601 msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:639 ../src/surfer.c:1099 +#: ../src/surfer.c:644 ../src/surfer.c:1104 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:852 ../src/surfer.c:1241 +#: ../src/surfer.c:857 ../src/surfer.c:1257 msgid "Save file as..." msgstr "Enregistrer sous..." -#: ../src/surfer.c:930 +#: ../src/surfer.c:935 msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:937 +#: ../src/surfer.c:942 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:944 +#: ../src/surfer.c:949 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:946 +#: ../src/surfer.c:951 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:972 +#: ../src/surfer.c:977 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:1060 +#: ../src/surfer.c:1065 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:1089 +#: ../src/surfer.c:1094 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1302 +#: ../src/surfer.c:1318 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1307 +#: ../src/surfer.c:1323 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1326 +#: ../src/surfer.c:1342 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1331 +#: ../src/surfer.c:1347 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1336 +#: ../src/surfer.c:1352 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1445 +#: ../src/surfer.c:1472 msgid "This connection is encrypted and trusted." msgstr "Cette connexion est chiffrée et de confiance." -#: ../src/surfer.c:1448 +#: ../src/surfer.c:1475 msgid "This connection is encrypted but not trusted." msgstr "Cette connexion est chiffrée mais pas de confiance." -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1479 msgid "This connection is not encrypted." msgstr "Cette connexion n'est pas chiffrée." -#: ../src/surfer.c:1459 ../src/surfer.c:1464 +#: ../src/surfer.c:1486 ../src/surfer.c:1491 msgid "Security" msgstr "Sécurité" -#: ../src/surfer.c:1500 +#: ../src/surfer.c:1527 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1541 ../src/surfer.c:1544 ../src/surfer.c:1599 -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1568 ../src/surfer.c:1571 ../src/surfer.c:1626 +#: ../src/surfer.c:1631 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1603 +#: ../src/surfer.c:1630 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 c6dd001..49434e0 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-21 04:13+0100\n" +"POT-Creation-Date: 2010-12-21 04:33+0100\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:779 -#: ../src/surfer.c:782 ../src/surfer.c:1169 ../src/surfer.c:1174 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:784 +#: ../src/surfer.c:787 ../src/surfer.c:1174 ../src/surfer.c:1179 msgid "Question" msgstr "" @@ -27,69 +27,69 @@ msgid "" "Do you really want to close every tab opened in this window?" msgstr "" -#: ../src/callbacks.c:452 +#: ../src/callbacks.c:470 msgid "Web surfer preferences" msgstr "" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:490 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:480 +#: ../src/callbacks.c:498 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:484 +#: ../src/callbacks.c:502 msgid "General" msgstr "" -#: ../src/callbacks.c:488 +#: ../src/callbacks.c:506 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:492 +#: ../src/callbacks.c:510 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:499 +#: ../src/callbacks.c:517 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:503 +#: ../src/callbacks.c:521 msgid "Port:" msgstr "" -#: ../src/callbacks.c:511 +#: ../src/callbacks.c:529 msgid "Network" msgstr "" -#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:841 +#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:855 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:891 +#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:905 msgid "Connected" msgstr "" -#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:926 -#: ../src/ghtml-webkit.c:513 ../src/ghtml-webkit.c:654 -#: ../src/ghtml-webkit.c:666 +#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:940 +#: ../src/ghtml-webkit.c:537 ../src/ghtml-webkit.c:678 +#: ../src/ghtml-webkit.c:690 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:972 +#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:986 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:976 +#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:990 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:981 +#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:995 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1077 +#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1091 msgid "Timeout" msgstr "" @@ -126,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:899 ../src/surfer.c:902 +#: ../src/surfer.c:904 ../src/surfer.c:907 msgid "Error" msgstr "" @@ -181,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:612 ../src/surfer.c:901 +#: ../src/download.c:605 ../src/ghtml-webkit.c:636 ../src/surfer.c:906 msgid "Unknown error" msgstr "" @@ -192,32 +192,32 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" -#: ../src/ghtml-gtkhtml.c:718 +#: ../src/ghtml-gtkhtml.c:732 msgid "Unknown protocol" msgstr "" -#: ../src/ghtml-gtkhtml.c:784 +#: ../src/ghtml-gtkhtml.c:798 msgid "Reading file..." msgstr "" -#: ../src/ghtml-gtkhtml.c:996 +#: ../src/ghtml-gtkhtml.c:1010 msgid "Redirecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1004 +#: ../src/ghtml-gtkhtml.c:1018 msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1038 ../src/ghtml-webkit.c:408 -#: ../src/ghtml-webkit.c:511 +#: ../src/ghtml-gtkhtml.c:1052 ../src/ghtml-webkit.c:408 +#: ../src/ghtml-webkit.c:535 msgid "Connecting..." msgstr "" -#: ../src/ghtml-gtkhtml.c:1041 +#: ../src/ghtml-gtkhtml.c:1055 msgid "Connecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1199 +#: ../src/ghtml-gtkhtml.c:1213 msgid "Unsupported method" msgstr "" @@ -258,198 +258,206 @@ msgid "_Close" msgstr "" #: ../src/surfer.c:128 -msgid "_Cut" -msgstr "" - -#: ../src/surfer.c:129 -msgid "Cop_y" +msgid "_Undo" msgstr "" #: ../src/surfer.c:130 -msgid "_Paste" +msgid "_Redo" msgstr "" #: ../src/surfer.c:133 +msgid "_Cut" +msgstr "" + +#: ../src/surfer.c:134 +msgid "Cop_y" +msgstr "" + +#: ../src/surfer.c:135 +msgid "_Paste" +msgstr "" + +#: ../src/surfer.c:138 msgid "Select _all" msgstr "" -#: ../src/surfer.c:140 +#: ../src/surfer.c:145 msgid "_Unselect all" msgstr "" -#: ../src/surfer.c:142 +#: ../src/surfer.c:147 msgid "_Find" msgstr "" -#: ../src/surfer.c:145 +#: ../src/surfer.c:150 msgid "_Preferences" msgstr "" -#: ../src/surfer.c:152 ../src/surfer.c:207 +#: ../src/surfer.c:157 ../src/surfer.c:212 msgid "Zoom in" msgstr "" -#: ../src/surfer.c:154 ../src/surfer.c:208 +#: ../src/surfer.c:159 ../src/surfer.c:213 msgid "Zoom out" msgstr "" -#: ../src/surfer.c:156 ../src/surfer.c:209 +#: ../src/surfer.c:161 ../src/surfer.c:214 msgid "Normal size" msgstr "" -#: ../src/surfer.c:159 +#: ../src/surfer.c:164 msgid "_Refresh" msgstr "" -#: ../src/surfer.c:161 +#: ../src/surfer.c:166 msgid "_Force refresh" msgstr "" -#: ../src/surfer.c:163 +#: ../src/surfer.c:168 msgid "_Stop" msgstr "" -#: ../src/surfer.c:166 +#: ../src/surfer.c:171 msgid "Javascript _console" msgstr "" -#: ../src/surfer.c:168 +#: ../src/surfer.c:173 msgid "Page so_urce" msgstr "" -#: ../src/surfer.c:175 +#: ../src/surfer.c:180 msgid "_About" msgstr "" -#: ../src/surfer.c:186 +#: ../src/surfer.c:191 msgid "_File" msgstr "" -#: ../src/surfer.c:187 +#: ../src/surfer.c:192 msgid "_Edit" msgstr "" -#: ../src/surfer.c:188 +#: ../src/surfer.c:193 msgid "_View" msgstr "" -#: ../src/surfer.c:189 +#: ../src/surfer.c:194 msgid "_Help" msgstr "" -#: ../src/surfer.c:196 +#: ../src/surfer.c:201 msgid "Back" msgstr "" -#: ../src/surfer.c:198 +#: ../src/surfer.c:203 msgid "Forward" msgstr "" -#: ../src/surfer.c:200 +#: ../src/surfer.c:205 msgid "Stop" msgstr "" -#: ../src/surfer.c:201 +#: ../src/surfer.c:206 msgid "Refresh" msgstr "" -#: ../src/surfer.c:204 +#: ../src/surfer.c:209 msgid "Home" msgstr "" -#: ../src/surfer.c:292 ../src/surfer.c:626 +#: ../src/surfer.c:297 ../src/surfer.c:631 msgid "Web surfer" msgstr "" -#: ../src/surfer.c:340 +#: ../src/surfer.c:345 msgid " Location: " msgstr "" -#: ../src/surfer.c:596 +#: ../src/surfer.c:601 msgid "Ready" msgstr "" -#: ../src/surfer.c:639 ../src/surfer.c:1099 +#: ../src/surfer.c:644 ../src/surfer.c:1104 msgid "Untitled" msgstr "" -#: ../src/surfer.c:852 ../src/surfer.c:1241 +#: ../src/surfer.c:857 ../src/surfer.c:1257 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:930 +#: ../src/surfer.c:935 msgid "Find text" msgstr "" -#: ../src/surfer.c:937 +#: ../src/surfer.c:942 msgid "Text:" msgstr "" -#: ../src/surfer.c:944 +#: ../src/surfer.c:949 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:946 +#: ../src/surfer.c:951 msgid "Wrap" msgstr "" -#: ../src/surfer.c:972 +#: ../src/surfer.c:977 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1060 +#: ../src/surfer.c:1065 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1089 +#: ../src/surfer.c:1094 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1302 +#: ../src/surfer.c:1318 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1307 +#: ../src/surfer.c:1323 msgid "Command:" msgstr "" -#: ../src/surfer.c:1326 +#: ../src/surfer.c:1342 msgid "Message" msgstr "" -#: ../src/surfer.c:1331 +#: ../src/surfer.c:1347 msgid "Source" msgstr "" -#: ../src/surfer.c:1336 +#: ../src/surfer.c:1352 msgid "Line" msgstr "" -#: ../src/surfer.c:1445 +#: ../src/surfer.c:1472 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1448 +#: ../src/surfer.c:1475 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1452 +#: ../src/surfer.c:1479 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1459 ../src/surfer.c:1464 +#: ../src/surfer.c:1486 ../src/surfer.c:1491 msgid "Security" msgstr "" -#: ../src/surfer.c:1500 +#: ../src/surfer.c:1527 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1541 ../src/surfer.c:1544 ../src/surfer.c:1599 -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1568 ../src/surfer.c:1571 ../src/surfer.c:1626 +#: ../src/surfer.c:1631 msgid "Warning" msgstr "" -#: ../src/surfer.c:1603 +#: ../src/surfer.c:1630 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/callbacks.c b/src/callbacks.c index d514e07..751ce0a 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -133,6 +133,24 @@ void on_file_save_as(gpointer data) /* edit menu */ +/* on_edit_undo */ +void on_edit_undo(gpointer data) +{ + Surfer * surfer = data; + + surfer_undo(surfer); +} + + +/* on_edit_redo */ +void on_edit_redo(gpointer data) +{ + Surfer * surfer = data; + + surfer_redo(surfer); +} + + /* on_edit_find */ void on_edit_find(gpointer data) { diff --git a/src/callbacks.h b/src/callbacks.h index fd163f6..ce2a0b1 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -36,6 +36,8 @@ void on_file_print(gpointer data); void on_file_save_as(gpointer data); /* edit menu */ +void on_edit_undo(gpointer data); +void on_edit_redo(gpointer data); void on_edit_find(gpointer data); void on_edit_preferences(gpointer data); void on_edit_select_all(gpointer data); diff --git a/src/ghtml-gtkhtml.c b/src/ghtml-gtkhtml.c index 90f4c50..e4beefc 100644 --- a/src/ghtml-gtkhtml.c +++ b/src/ghtml-gtkhtml.c @@ -359,6 +359,13 @@ void ghtml_print(GtkWidget * ghtml) } +/* ghtml_redo */ +void ghtml_redo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_refresh */ void ghtml_refresh(GtkWidget * widget) { @@ -400,6 +407,13 @@ void ghtml_stop(GtkWidget * widget) } +/* ghtml_undo */ +void ghtml_undo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_unselect_all */ void ghtml_unselect_all(GtkWidget * widget) { diff --git a/src/ghtml-gtkmozembed.c b/src/ghtml-gtkmozembed.c index b6d6721..17333fa 100644 --- a/src/ghtml-gtkmozembed.c +++ b/src/ghtml-gtkmozembed.c @@ -462,6 +462,13 @@ void ghtml_print(GtkWidget * ghtml) } +/* ghtml_redo */ +void ghtml_redo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_refresh */ void ghtml_refresh(GtkWidget * ghtml) { @@ -492,6 +499,13 @@ void ghtml_stop(GtkWidget * ghtml) } +/* ghtml_undo */ +void ghtml_undo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_unselect_all */ void ghtml_unselect_all(GtkWidget * ghtml) { diff --git a/src/ghtml-gtktextview.c b/src/ghtml-gtktextview.c index 8281c61..0c284c1 100644 --- a/src/ghtml-gtktextview.c +++ b/src/ghtml-gtktextview.c @@ -564,6 +564,13 @@ void ghtml_print(GtkWidget * ghtml) } +/* ghtml_redo */ +void ghtml_redo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_refresh */ void ghtml_refresh(GtkWidget * widget) { @@ -607,6 +614,13 @@ void ghtml_select_all(GtkWidget * widget) } +/* ghtml_undo */ +void ghtml_undo(GtkWidget * widget) +{ + /* FIXME implement */ +} + + /* ghtml_unselect_all */ void ghtml_unselect_all(GtkWidget * widget) { diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c index 0f13671..c88892a 100644 --- a/src/ghtml-webkit.c +++ b/src/ghtml-webkit.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ /* FIXME - * - implement undo/redo */ + * - implement copy/cut/paste */ @@ -423,6 +423,16 @@ void ghtml_print(GtkWidget * widget) } +/* ghtml_redo */ +void ghtml_redo(GtkWidget * widget) +{ + GHtml * ghtml; + + ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); + webkit_web_view_redo(WEBKIT_WEB_VIEW(ghtml->view)); +} + + void ghtml_refresh(GtkWidget * widget) { GHtml * ghtml; @@ -463,12 +473,24 @@ void ghtml_select_all(GtkWidget * widget) } +/* ghtml_undo */ +void ghtml_undo(GtkWidget * widget) +{ + GHtml * ghtml; + + ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); + webkit_web_view_undo(WEBKIT_WEB_VIEW(ghtml->view)); +} + + +/* ghtml_unselect_all */ void ghtml_unselect_all(GtkWidget * widget) { /* FIXME implement */ } +/* ghtml_zoom_in */ void ghtml_zoom_in(GtkWidget * widget) { GHtml * ghtml; @@ -478,6 +500,7 @@ void ghtml_zoom_in(GtkWidget * widget) } +/* ghtml_zoom_out */ void ghtml_zoom_out(GtkWidget * widget) { GHtml * ghtml; @@ -487,6 +510,7 @@ void ghtml_zoom_out(GtkWidget * widget) } +/* ghtml_zoom_reset */ void ghtml_zoom_reset(GtkWidget * widget) { GHtml * ghtml; diff --git a/src/ghtml.h b/src/ghtml.h index 379cce7..aec6025 100644 --- a/src/ghtml.h +++ b/src/ghtml.h @@ -60,6 +60,9 @@ void ghtml_unselect_all(GtkWidget * ghtml); gboolean ghtml_find(GtkWidget * ghtml, char const * text, gboolean sensitive, gboolean wrap); +void ghtml_redo(GtkWidget * ghtml); +void ghtml_undo(GtkWidget * ghtml); + void ghtml_zoom_in(GtkWidget * ghtml); void ghtml_zoom_out(GtkWidget * ghtml); void ghtml_zoom_reset(GtkWidget * ghtml); diff --git a/src/surfer.c b/src/surfer.c index dccf5aa..9948962 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -125,6 +125,11 @@ static DesktopMenu _menu_file[] = static DesktopMenu _menu_edit[] = { + { N_("_Undo"), G_CALLBACK(on_edit_undo), GTK_STOCK_UNDO, + GDK_CONTROL_MASK, GDK_Z }, + { N_("_Redo"), G_CALLBACK(on_edit_redo), GTK_STOCK_REDO, + GDK_CONTROL_MASK, GDK_Y }, + { "", NULL, NULL, 0, 0 }, { N_("_Cut"), NULL, GTK_STOCK_CUT, GDK_CONTROL_MASK, GDK_X }, { N_("Cop_y"), NULL, GTK_STOCK_COPY, GDK_CONTROL_MASK, GDK_C }, { N_("_Paste"), NULL, GTK_STOCK_PASTE, GDK_CONTROL_MASK, @@ -1215,6 +1220,17 @@ void surfer_reload(Surfer * surfer) } +/* surfer_redo */ +void surfer_redo(Surfer * surfer) +{ + GtkWidget * view; + + if((view = surfer_get_view(surfer)) == NULL) + return; + ghtml_redo(view); +} + + /* surfer_resize */ void surfer_resize(Surfer * surfer, gint width, gint height) { @@ -1417,6 +1433,17 @@ void surfer_stop(Surfer * surfer) } +/* surfer_undo */ +void surfer_undo(Surfer * surfer) +{ + GtkWidget * view; + + if((view = surfer_get_view(surfer)) == NULL) + return; + ghtml_undo(view); +} + + /* surfer_unselect_all */ void surfer_unselect_all(Surfer * surfer) { diff --git a/src/surfer.h b/src/surfer.h index 01df976..0e1fa0a 100644 --- a/src/surfer.h +++ b/src/surfer.h @@ -105,6 +105,10 @@ void surfer_find(Surfer * surfer, char const * text); /* download */ int surfer_download(Surfer * surfer, char const * url, char const * suggested); +/* edition */ +void surfer_redo(Surfer * surfer); +void surfer_undo(Surfer * surfer); + /* interface */ void surfer_about(Surfer * surfer); void surfer_resize(Surfer * surfer, gint width, gint height);