diff --git a/po/POTFILES b/po/POTFILES index 3d4a81a..1c0a8e3 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,5 +1,7 @@ ../src/callbacks.c ../src/common/conn.c ../src/download.c +../src/ghtml-gtkhtml.c +../src/ghtml-webkit.c ../src/main.c ../src/surfer.c diff --git a/po/de.po b/po/de.po index e9358c0..6e4bc8e 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-04-11 12:17+0200\n" +"POT-Creation-Date: 2010-04-11 13:04+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -52,31 +52,32 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:163 ../src/download.c:165 +#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:212 ../src/download.c:430 +#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 msgid "Connected" msgstr "" -#: ../src/common/conn.c:237 +#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 +#: ../src/ghtml-webkit.c:434 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:262 +#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:266 +#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:271 +#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:305 ../src/download.c:507 +#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 msgid "Timeout" msgstr "" @@ -133,9 +134,8 @@ msgid "%.1f of %.1f kB" msgstr "" #: ../src/download.c:438 -#, fuzzy msgid "Error " -msgstr "Fehler" +msgstr "Fehler " #: ../src/download.c:463 ../src/download.c:583 msgid "Complete" @@ -157,7 +157,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:546 ../src/surfer.c:508 +#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 msgid "Unknown error" msgstr "" @@ -168,6 +168,34 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" +#: ../src/ghtml-gtkhtml.c:634 +msgid "Unknown protocol" +msgstr "" + +#: ../src/ghtml-gtkhtml.c:700 +msgid "Reading file..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:910 +msgid "Redirecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:920 +msgid "Redirecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:954 +msgid "Connecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:957 +msgid "Connecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:1115 +msgid "Unsupported method" +msgstr "" + #: ../src/main.c:42 msgid "Usage: surfer [URL]\n" msgstr "Usage: surfer [URL]\n" diff --git a/po/es.po b/po/es.po index 506d6b1..f6345b2 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-04-11 12:17+0200\n" +"POT-Creation-Date: 2010-04-11 13:04+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -52,31 +52,32 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:163 ../src/download.c:165 +#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:212 ../src/download.c:430 +#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 msgid "Connected" msgstr "" -#: ../src/common/conn.c:237 +#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 +#: ../src/ghtml-webkit.c:434 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:262 +#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:266 +#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:271 +#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:305 ../src/download.c:507 +#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 msgid "Timeout" msgstr "" @@ -156,7 +157,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:546 ../src/surfer.c:508 +#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 msgid "Unknown error" msgstr "" @@ -167,6 +168,34 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" +#: ../src/ghtml-gtkhtml.c:634 +msgid "Unknown protocol" +msgstr "" + +#: ../src/ghtml-gtkhtml.c:700 +msgid "Reading file..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:910 +msgid "Redirecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:920 +msgid "Redirecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:954 +msgid "Connecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:957 +msgid "Connecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:1115 +msgid "Unsupported method" +msgstr "" + #: ../src/main.c:42 msgid "Usage: surfer [URL]\n" msgstr "Usage: surfer [URL]\n" diff --git a/po/fr.po b/po/fr.po index f4a75bd..ae6902c 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-04-11 12:17+0200\n" +"POT-Creation-Date: 2010-04-11 13:04+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -52,31 +52,32 @@ msgstr "Page d'accueil:" msgid "General" msgstr "Général" -#: ../src/common/conn.c:163 ../src/download.c:165 +#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 msgid "Resolving..." msgstr "Résolution du nom..." -#: ../src/common/conn.c:212 ../src/download.c:430 +#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 msgid "Connected" msgstr "Connecté" -#: ../src/common/conn.c:237 +#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 +#: ../src/ghtml-webkit.c:434 msgid "Downloading..." msgstr "Téléchargement..." -#: ../src/common/conn.c:262 +#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:266 +#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../src/common/conn.c:271 +#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 msgid "Unspecified error" msgstr "Erreur non spécifiée" -#: ../src/common/conn.c:305 ../src/download.c:507 +#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 msgid "Timeout" msgstr "" @@ -156,7 +157,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:546 ../src/surfer.c:508 +#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 msgid "Unknown error" msgstr "Erreur inconnue" @@ -167,6 +168,34 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" +#: ../src/ghtml-gtkhtml.c:634 +msgid "Unknown protocol" +msgstr "" + +#: ../src/ghtml-gtkhtml.c:700 +msgid "Reading file..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:910 +msgid "Redirecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:920 +msgid "Redirecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:954 +msgid "Connecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:957 +msgid "Connecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:1115 +msgid "Unsupported method" +msgstr "" + #: ../src/main.c:42 msgid "Usage: surfer [URL]\n" msgstr "Usage: surfer [URL]\n" diff --git a/po/it.po b/po/it.po index 63b6c7f..250abcd 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-04-11 12:17+0200\n" +"POT-Creation-Date: 2010-04-11 13:04+0200\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -52,31 +52,32 @@ msgstr "" msgid "General" msgstr "" -#: ../src/common/conn.c:163 ../src/download.c:165 +#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 msgid "Resolving..." msgstr "" -#: ../src/common/conn.c:212 ../src/download.c:430 +#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 msgid "Connected" msgstr "" -#: ../src/common/conn.c:237 +#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 +#: ../src/ghtml-webkit.c:434 msgid "Downloading..." msgstr "" -#: ../src/common/conn.c:262 +#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 msgid "Unsupported protocol" msgstr "" -#: ../src/common/conn.c:266 +#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 msgid "Unknown host" msgstr "" -#: ../src/common/conn.c:271 +#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 msgid "Unspecified error" msgstr "" -#: ../src/common/conn.c:305 ../src/download.c:507 +#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 msgid "Timeout" msgstr "" @@ -156,7 +157,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:546 ../src/surfer.c:508 +#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 msgid "Unknown error" msgstr "" @@ -167,6 +168,34 @@ msgid "" " -U\tuser agent string to send\n" msgstr "" +#: ../src/ghtml-gtkhtml.c:634 +msgid "Unknown protocol" +msgstr "" + +#: ../src/ghtml-gtkhtml.c:700 +msgid "Reading file..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:910 +msgid "Redirecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:920 +msgid "Redirecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:954 +msgid "Connecting..." +msgstr "" + +#: ../src/ghtml-gtkhtml.c:957 +msgid "Connecting to " +msgstr "" + +#: ../src/ghtml-gtkhtml.c:1115 +msgid "Unsupported method" +msgstr "" + #: ../src/main.c:42 msgid "Usage: surfer [URL]\n" msgstr "" diff --git a/src/ghtml-gtkhtml.c b/src/ghtml-gtkhtml.c index 8e01e37..b4a4b65 100644 --- a/src/ghtml-gtkhtml.c +++ b/src/ghtml-gtkhtml.c @@ -631,7 +631,7 @@ static gboolean _stream_load_idle(gpointer data) } if(strncmp(conn->url, "http:", 5) == 0) return _stream_load_idle_http(conn); - surfer_error(conn->ghtml->surfer, "Unknown protocol", 0); + surfer_error(conn->ghtml->surfer, _("Unknown protocol"), 0); _ghtmlconn_delete(conn); return FALSE; } @@ -697,7 +697,7 @@ static gboolean _stream_load_idle_file(GHtmlConn * conn) else { surfer_set_progress(conn->ghtml->surfer, 0.0); - surfer_set_status(conn->ghtml->surfer, "Reading file..."); + surfer_set_status(conn->ghtml->surfer, _("Reading file...")); if(fstat(fd, &st) == 0) { if(S_ISDIR(st.st_mode)) @@ -755,7 +755,7 @@ static gboolean _stream_load_watch_file(GIOChannel * source, static gboolean _stream_load_idle_http(GHtmlConn * conn) { surfer_set_progress(conn->ghtml->surfer, -1.0); - surfer_set_status(conn->ghtml->surfer, "Resolving..."); + surfer_set_status(conn->ghtml->surfer, _("Resolving...")); conn->http = gnet_conn_http_new(); gnet_conn_http_set_uri(conn->http, conn->url); gnet_conn_http_set_user_agent(conn->http, "DeforaOS " PACKAGE); @@ -805,7 +805,7 @@ static void _stream_load_watch_http(GConnHttp * connhttp, static void _http_connected(GHtmlConn * conn) { - surfer_set_status(conn->ghtml->surfer, "Connected"); + surfer_set_status(conn->ghtml->surfer, _("Connected")); } static void _http_data_complete(GConnHttpEventData * event, GHtmlConn * conn) @@ -840,7 +840,7 @@ static void _http_data_partial(GConnHttpEventData * event, GHtmlConn * conn) gchar * buf; gsize size; - surfer_set_status(conn->ghtml->surfer, "Downloading..."); + surfer_set_status(conn->ghtml->surfer, _("Downloading...")); if(gnet_conn_http_steal_buffer(conn->http, &buf, &size) != TRUE) { /* FIXME report error */ @@ -886,16 +886,16 @@ static void _http_error(GConnHttpEventError * event, GHtmlConn * conn) switch(event->code) { case GNET_CONN_HTTP_ERROR_PROTOCOL_UNSUPPORTED: - msg = "Unsupported protocol"; + msg = _("Unsupported protocol"); break; #if GNET_CHECK_VERSION(2, 0, 8) /* XXX unsure about the exact version */ case GNET_CONN_HTTP_ERROR_HOSTNAME_RESOLUTION: - msg = "Unknown host"; + msg = _("Unknown host"); break; #endif case GNET_CONN_HTTP_ERROR_UNSPECIFIED: default: - msg = "Unspecified error"; + msg = _("Unspecified error"); break; } surfer_set_progress(conn->ghtml->surfer, -1.0); @@ -907,7 +907,7 @@ static void _http_error(GConnHttpEventError * event, GHtmlConn * conn) static void _http_redirect(GConnHttpEventRedirect * event, GHtmlConn * conn) { GHtml * ghtml = conn->ghtml; - char buf[256] = "Redirecting..."; + char buf[256] = _("Redirecting..."); char * url = event->new_location; if(conn == conn->ghtml->conns[0] && url == NULL) /* XXX ugly */ @@ -917,7 +917,7 @@ static void _http_redirect(GConnHttpEventRedirect * event, GHtmlConn * conn) } if((url = _ghtml_make_url(_ghtml_get_base(ghtml), url)) != NULL) { - snprintf(buf, sizeof(buf), "%s %s", "Redirecting to ", url); + snprintf(buf, sizeof(buf), "%s %s", _("Redirecting to "), url); g_free(conn->url); conn->url = url; } @@ -951,11 +951,11 @@ static void _http_resolved(GConnHttpEventResolved * event, GHtmlConn * conn) #endif } else if((name = gnet_inetaddr_get_name_nonblock(event->ia)) == NULL) - surfer_set_status(conn->ghtml->surfer, "Connecting..."); + surfer_set_status(conn->ghtml->surfer, _("Connecting...")); else { - snprintf(buf, sizeof(buf), "%s%s%s%d", "Connecting to ", name, - ":", gnet_inetaddr_get_port(event->ia)); + snprintf(buf, sizeof(buf), "%s%s%s%d", _("Connecting to "), + name, ":", gnet_inetaddr_get_port(event->ia)); surfer_set_status(conn->ghtml->surfer, buf); } } @@ -990,7 +990,7 @@ static void _http_response(GConnHttpEventResponse * event, GHtmlConn * conn) static void _http_timeout(GHtmlConn * conn) { - surfer_error(conn->ghtml->surfer, "Timed out", 0); + surfer_error(conn->ghtml->surfer, _("Timeout"), 0); surfer_set_progress(conn->ghtml->surfer, -1.0); surfer_set_status(conn->ghtml->surfer, NULL); _ghtmlconn_delete(conn); @@ -1112,7 +1112,7 @@ static void _on_submit(HtmlDocument * document, const gchar * url, else if(strcasecmp(method, "POST") == 0) _ghtml_document_load(ghtml, u, encoding); else - surfer_error(ghtml->surfer, "Unsupported method", 0); + surfer_error(ghtml->surfer, _("Unsupported method"), 0); g_free(u); } diff --git a/src/ghtml-gtktextview.c b/src/ghtml-gtktextview.c index 791fe21..674b83c 100644 --- a/src/ghtml-gtktextview.c +++ b/src/ghtml-gtktextview.c @@ -16,11 +16,13 @@ #include +#include #include "ghtml.h" #include "../config.h" #include "common/conn.c" #include "common/history.c" #include "common/url.c" +#define _(string) gettext(string) /* private */ diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c index bd46786..4514a3b 100644 --- a/src/ghtml-webkit.c +++ b/src/ghtml-webkit.c @@ -15,10 +15,12 @@ +#include #include #include "ghtml.h" #include "common.h" /* XXX should not be needed */ #include "common/url.c" +#define _(string) gettext(string) /* private */ @@ -382,7 +384,7 @@ static gboolean _on_load_error(WebKitWebView * view, WebKitWebFrame * frame, surfer = g_object_get_data(G_OBJECT(data), "surfer"); if(error == NULL) - return surfer_error(surfer, "Unknown error", TRUE); + return surfer_error(surfer, _("Unknown error"), TRUE); if(error->domain == WEBKIT_NETWORK_ERROR && error->code == WEBKIT_NETWORK_ERROR_CANCELLED) return TRUE; /* ignored if the user cancelled it */ @@ -431,7 +433,7 @@ static void _on_load_started(WebKitWebView * view, WebKitWebFrame * frame, surfer = g_object_get_data(G_OBJECT(data), "surfer"); surfer_set_progress(surfer, 0.0); - surfer_set_status(surfer, "Downloading..."); + surfer_set_status(surfer, _("Downloading...")); }