From: Ryan Niebur Date: Thu, 24 Dec 2009 23:50:19 +0000 (-0800) Subject: Imported Upstream version 0.2.2 X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e400912e290602edeffe98814784185b75f358;p=midori Imported Upstream version 0.2.2 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..7fe1870d --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +Makefile + +.waf-* +.lock-wscript +_build_ + +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +po/*.gmo + +midori.desktop diff --git a/AUTHORS b/AUTHORS index 7abcf9b0..31b6fdd3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -52,6 +52,7 @@ Translations: it: Luca Perri ja: Masato Hashimoto nl: Vincent Tunru + no: Olav Andreas Lindekleiv pl: Przemysław Sitek pl: Lukasz Romanowicz pt_PT: Sérgio Marques diff --git a/ChangeLog b/ChangeLog index 8a808dea..70c7a892 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,49 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.2.2 + + Turn libnotify into a proper build-time dependency + + Use Ctrl + Return to open tabs from the location entry + + Support right-click on bookmark menu items + + Support -e in midori -a and with multiple commands + + Make Middle click open selection search if needed + + Make Ctrl+C work as expected again + + Fix order of History, Trash and Recently opened pages + + Revise Shortcuts dialogue to fix oddities + + Perform Form history completion case insensitive + + Add 'Web Cache' to Delete Private data dialogue + + Load accels from /etc/xdg if present + + Improve XBEL format compatibility and performance + + Fix inline find by correcting key handling + + Add option to open panels in separate windows + + Support Portrait orientation in Fremantle + + Support Hildon MIME and URI handling + + Check status before caching in Web Cache + + Show popup menu on news feed icon if needed + + Support Colourful Tabs with Tab Panel + + Tweak sqlite and dbus handling for Win32 + + 'Run as web app' and 'Show in toolbar' for bookmarks + + Add 'Small icons' toolbar style + + Fix build with Glib < 2.20 and GTK+ < 2.12 + + Add Import bookmarks for XBEL, Opera and RDF + + Add Open Link in Foreground/ Background Tab menu + + Allow closing all tabs + + Hildon file chooser support + +v0.2.1 + + Fix Mouse Gestures to work after activation + + Explicitly link to X11 to support gold + + Implement various Hildon specific features + + Hide the navigationbar in fullscreen + + Implement permanent storage of form history + + Support keyboard shortcuts like Ctrl+Tab or "a" + + Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT + + Make creation of new windows fast + + Introduce the Tab History List extension + + Load icons laziy at startup to speed up startup + + Introduce a Web Cache extension + + Refactor and tweak the Preferences dialogue + + Implement combos to choose external applications + v0.2.0 + (Kinetic) drag scrolling on touchscreen devices + Workaround a speed dial crasher diff --git a/INSTALL b/INSTALL index 9eb4519c..1f389d7b 100644 --- a/INSTALL +++ b/INSTALL @@ -16,8 +16,8 @@ You can now run Midori from the build folder like so './waf build --run' -This is a convenience that will load extensions as well as -localizations from the build folder. +Using --run as shown above will make sure extensions as well as +localizations are used from the build folder. You can install it with './waf install' @@ -51,6 +51,12 @@ If you are interested in HTTP communication, try this: Where '2' can be a level between 0 and 3. +If you are interested in (non-) touchscreen behaviour, try this: + +'MIDORI_TOUCHSCREEN=1 _build_/default/midori/midori', or + +'MIDORI_TOUCHSCREEN=0 _build_/default/midori/midori' + For further information a tutorial for gdb and reading up on how you can install debugging symbols for libraries used by Midori are recommended. diff --git a/TODO b/TODO index 27f4bf1e..141eb262 100644 --- a/TODO +++ b/TODO @@ -3,10 +3,8 @@ This file is licensed under the terms of the expat license, see the file EXPAT. TODO: . Use an update timeout in KatzePropertyProxy instead of only focus-out . Show a loading mouse pointer - . Scroll tabs w/o switching tabs . Import and export of the bookmarks file, or using one from a specific path . Custom context menu actions, like in Thunar or Epiphany - . Custom tab names . Analogus to blocked popups, blocked scripts moving layers on load (extension) . Per-site blocking of individual elements on a page . Statusbar icon 'cookies blocked', icon 'popups blocked' @@ -17,7 +15,6 @@ TODO: . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page . Have an internal uri scheme, eg. 'res:', to reference eg. themed icons . 'about:' uris: about, blank, cache, config, plugins - . Panel of open tabs (with tree-structure), optional thumbnail-view . Check specific bookmarks for updates automatically (extension) . Mark "new" as well as "actually modified" tabs specially (even over sessions) . SearchEngine: "Show in context menu" @@ -32,7 +29,6 @@ TODO: . Style: none, compatible (b/w), default, [styles], "media", ["media" styles], ... . Mouse pointer coordinates in the status bar (extension) . Draw rectangle with the mouse, x/y/x2/y2 in the statusbar (extension) - . Formfill (like Opera's magic wand) . Private browsing mode (no browsing, download or search history) . Shared bookmarks and config . Custom-mode, e.g. hide menubar and use help icon to have a help viewer diff --git a/data/autosuggestcontrol.js b/data/autosuggestcontrol.js index fc0d251b..83afeb91 100644 --- a/data/autosuggestcontrol.js +++ b/data/autosuggestcontrol.js @@ -1,9 +1,9 @@ /** * An autosuggest textbox control. * from Nicholas C. Zakas (Author) example: http://www.nczonline.net/ - * @class - * @scope public + * Adopted for Midori by Alexander V. Butenko */ + function AutoSuggestControl(oTextbox /*:HTMLInputElement*/, oProvider /*:SuggestionProvider*/) { /** @@ -28,7 +28,6 @@ function AutoSuggestControl(oTextbox /*:HTMLInputElement*/, this.textbox /*:HTMLInputElement*/ = oTextbox; //initialize the control this.init(); - } /** @@ -38,13 +37,9 @@ function AutoSuggestControl(oTextbox /*:HTMLInputElement*/, * @param aSuggestions An array of suggestion strings. * @param bTypeAhead If the control should provide a type ahead suggestion. */ -AutoSuggestControl.prototype.autosuggest = function (aSuggestions /*:Array*/, - bTypeAhead /*:boolean*/) { +AutoSuggestControl.prototype.autosuggest = function (aSuggestions /*:Array*/) { //make sure theres at least one suggestion if (aSuggestions.length > 0) { - if (bTypeAhead) { - this.typeAhead(aSuggestions[0]); - } this.showSuggestions(aSuggestions); } else { this.hideSuggestions(); @@ -56,17 +51,14 @@ AutoSuggestControl.prototype.autosuggest = function (aSuggestions /*:Array*/, * @scope private */ AutoSuggestControl.prototype.createDropDown = function () { - var oThis = this; //create the layer and assign styles this.layer = document.createElement("div"); this.layer.className = "suggestions"; this.layer.style.visibility = "hidden"; - this.layer.style.width = this.textbox.offsetWidth + 10; + this.layer.style.width = this.textbox.offsetWidth; - //when the user clicks on the a suggestion, get the text (innerHTML) - //and place it into a textbox this.layer.onmousedown = this.layer.onmouseup = this.layer.onmouseover = function (oEvent) { @@ -82,8 +74,6 @@ AutoSuggestControl.prototype.createDropDown = function () { oThis.textbox.focus(); } }; - - document.body.appendChild(this.layer); }; @@ -93,7 +83,6 @@ AutoSuggestControl.prototype.createDropDown = function () { * @return The left coordinate of the textbox in pixels. */ AutoSuggestControl.prototype.getLeft = function () /*:int*/ { - var oNode = this.textbox; var iLeft = 0; @@ -148,8 +137,7 @@ AutoSuggestControl.prototype.handleKeyUp = function (oEvent /*:Event*/) { var iKeyCode = oEvent.keyCode; //for backspace (8) and delete (46), shows suggestions without typeahead if (iKeyCode == 8 || iKeyCode == 46) { - this.provider.requestSuggestions(this, false); - + this.provider.requestSuggestions(this); //make sure not to interfere with non-character keys } else if (iKeyCode < 32 || (iKeyCode >= 33 && iKeyCode < 46) || (iKeyCode >= 112 && iKeyCode <= 123) ) { //ignore @@ -158,11 +146,8 @@ AutoSuggestControl.prototype.handleKeyUp = function (oEvent /*:Event*/) { this.hideSuggestions(); } else { //request suggestions from the suggestion provider with typeahead - this.provider.requestSuggestions(this, true); + this.provider.requestSuggestions(this); } - - - }; /** @@ -195,44 +180,35 @@ AutoSuggestControl.prototype.highlightSuggestion = function (oSuggestionNode) { * @scope private */ AutoSuggestControl.prototype.init = function () { - //save a reference to this object var oThis = this; //assign the onkeyup event handler this.textbox.onkeyup = function (oEvent) { - //check for the proper location of the event object if (!oEvent) { oEvent = window.event; } - //call the handleKeyUp() method with the event object oThis.handleKeyUp(oEvent); }; //assign onkeydown event handler this.textbox.onkeydown = function (oEvent) { - //check for the proper location of the event object if (!oEvent) { oEvent = window.event; } - //call the handleKeyDown() method with the event object oThis.handleKeyDown(oEvent); }; //assign onblur event handler (hides suggestions) - this.textbox.onblur = function () { - oThis.hideSuggestions(); - }; - + this.textbox.onblur = this.textbox.onclick = function () { oThis.hideSuggestions(); }; - //create the suggestions dropdown this.createDropDown(); }; @@ -274,20 +250,9 @@ AutoSuggestControl.prototype.previousSuggestion = function () { * @param iLength The number of characters to select. */ AutoSuggestControl.prototype.selectRange = function (iStart /*:int*/, iLength /*:int*/) { - - //use text ranges for Internet Explorer - if (this.textbox.createTextRange) { - var oRange = this.textbox.createTextRange(); - oRange.moveStart("character", iStart); - oRange.moveEnd("character", iLength - this.textbox.value.length); - oRange.select(); - - //use setSelectionRange() for Mozilla - } else if (this.textbox.setSelectionRange) { + if (this.textbox.setSelectionRange) { this.textbox.setSelectionRange(iStart, iLength); } - - //set focus back to the textbox this.textbox.focus(); }; @@ -298,7 +263,6 @@ AutoSuggestControl.prototype.selectRange = function (iStart /*:int*/, iLength /* * @param aSuggestions An array of suggestions for the control. */ AutoSuggestControl.prototype.showSuggestions = function (aSuggestions /*:Array*/) { - var oDiv = null; this.layer.innerHTML = ""; //clear contents of the layer @@ -311,59 +275,41 @@ AutoSuggestControl.prototype.showSuggestions = function (aSuggestions /*:Array*/ this.layer.style.left = this.getLeft() + "px"; this.layer.style.top = (this.getTop()+this.textbox.offsetHeight) + "px"; this.layer.style.visibility = "visible"; - -}; - -/** - * Inserts a suggestion into the textbox, highlighting the - * suggested part of the text. - * @scope private - * @param sSuggestion The suggestion for the textbox. - */ -AutoSuggestControl.prototype.typeAhead = function (sSuggestion /*:String*/) { - - //check for support of typeahead functionality - if (this.textbox.createTextRange || this.textbox.setSelectionRange){ - var iLen = this.textbox.value.length; - this.textbox.value = sSuggestion; - this.selectRange(iLen, sSuggestion.length); - } }; - /** * Request suggestions for the given autosuggest control. * @scope protected * @param oAutoSuggestControl The autosuggest control to provide suggestions for. */ -FormSuggestions.prototype.requestSuggestions = function (oAutoSuggestControl /*:AutoSuggestControl*/, - bTypeAhead /*:boolean*/) { +FormSuggestions.prototype.requestSuggestions = function (oAutoSuggestControl /*:AutoSuggestControl*/) { var aSuggestions = []; - var sTextboxValue = oAutoSuggestControl.textbox.value; + var sTextboxValue = oAutoSuggestControl.textbox.value.toLowerCase(); if (!this.suggestions) return; + if (!sTextboxValue.length) + return; - if (sTextboxValue.length > 0){ - //search for matching suggestions - for (var i=0; i < this.suggestions.length; i++) { - if (this.suggestions[i].indexOf(sTextboxValue) == 0) { - aSuggestions.push(this.suggestions[i]); - } - } + //search for matching suggestions + for (var i=0; i < this.suggestions.length; i++) { + if (this.suggestions[i].toLowerCase().indexOf(sTextboxValue) == 0) { + aSuggestions.push(this.suggestions[i]); + } } //provide suggestions to the control - oAutoSuggestControl.autosuggest(aSuggestions, bTypeAhead); + oAutoSuggestControl.autosuggest(aSuggestions); }; function initSuggestions () { var inputs = document.getElementsByTagName("input"); + for (i=0;i -1) + midori_browser_set_current_page (browser, n); + return n > -1; } #endif @@ -316,7 +378,9 @@ adblock_get_preferences_dialog (MidoriExtension* extension) dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, #if !HAVE_OSX + #if !HAVE_HILDON GTK_STOCK_HELP, GTK_RESPONSE_HELP, + #endif GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); @@ -417,8 +481,10 @@ adblock_get_preferences_dialog (MidoriExtension* extension) G_CALLBACK (adblock_preferences_add_clicked_cb), liststore); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock (GTK_STOCK_EDIT); + g_object_set_data (G_OBJECT (button), "treeview", treeview); + g_signal_connect (button, "clicked", + G_CALLBACK (adblock_preferences_edit_clicked_cb), column); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); g_signal_connect (button, "clicked", G_CALLBACK (adblock_preferences_remove_clicked_cb), treeview); @@ -488,11 +554,39 @@ adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, } static gboolean -adblock_is_matched (const gchar* patt, +adblock_is_matched (const gchar* opts, const GRegex* regex, - const gchar* uri) + Matcher* data) { - return g_regex_match_full (regex, uri, -1, 0, 0, NULL, NULL); + gchar* patt; + + patt = g_strdup (data->uri); + /* TODO: To figure out + if (g_regex_match_simple ("type=fulluri,", opts, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY)) + patt = g_strdup (data->uri); + else + patt = g_strdup (data->query); + */ + if (g_regex_match_full (regex, patt, -1, 0, 0, NULL, NULL)) + { + if (g_regex_match_simple (",third-party", opts, + G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) + { + if (data->page_uri && g_regex_match_full (regex, data->page_uri, -1, 0, 0, NULL, NULL)) + { + g_free (patt); + return FALSE; + } + } + /* TODO: Domain opt check */ + g_free (patt); + return TRUE; + } + else + { + g_free (patt); + return FALSE; + } } #if HAVE_WEBKIT_RESOURCE_REQUEST @@ -502,15 +596,53 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, WebKitWebResource* web_resource, WebKitNetworkRequest* request, WebKitNetworkResponse* response, - MidoriView* view) + GtkWidget* image) { - const gchar* uri = webkit_network_request_get_uri (request); - if (!strncmp (uri, "data", 4)) + Matcher data; + const char *page_uri; + const gchar* uri; + SoupMessage* msg; + SoupURI* soup_uri; + + uri = webkit_network_request_get_uri (request); + if (!strncmp (uri, "data", 4) || !strncmp (uri, "file", 4)) + return; + + msg = webkit_network_request_get_message (request); + if (!msg) + return; + + if (msg->method && !strncmp (msg->method, "POST", 4)) return; - if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, (char*)uri)) + + soup_uri = soup_uri_new (uri); + if (soup_uri->query) + data.query = g_strdup_printf ("%s?%s", soup_uri->path, soup_uri->query); + else + data.query = g_strdup (soup_uri->path); + soup_uri_free (soup_uri); + + data.uri = uri; + page_uri = webkit_web_view_get_uri (web_view); + + if (!page_uri || !strcmp (page_uri, "about:blank")) + page_uri = uri; + data.page_uri = page_uri; + + if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, &data)) { + #if 0 + gchar* text; + + if (gtk_widget_get_has_tooltip (image)) + text = g_strdup_printf ("%s\n%s", gtk_widget_get_tooltip_text (image), uri); + else + text = g_strdup_printf ("Blocked content: \n%s", uri); + gtk_widget_set_tooltip_text (image, text); + g_free (text); + #endif + webkit_network_request_set_uri (request, "about:blank"); - /* TODO: Need to figure out how to indicate what was blocked */ } } #else @@ -518,10 +650,34 @@ static void adblock_session_request_queued_cb (SoupSession* session, SoupMessage* msg) { - SoupURI* soup_uri = soup_message_get_uri (msg); - gchar* uri = soup_uri ? soup_uri_to_string (soup_uri, FALSE) : g_strdup (""); - if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, uri)) + Matcher data; + SoupURI* soup_uri; + gchar* uri; + gchar* page_uri; + + if (msg->method && !strncmp (msg->method, "POST", 4)) + return; + + /* FIXME: There is a crasher somewhere introduced with the refactoring */ + + soup_uri = soup_message_get_uri (msg); + uri = soup_uri_to_string (soup_uri, FALSE); + if (soup_uri->query) + data.query = g_strdup_printf ("%s?%s", soup_uri->path, soup_uri->query); + else + data.query = g_strdup (soup_uri->path); + + data.uri = uri; + page_uri = NULL; /* FIXME */ + + if (!page_uri || !strcmp (page_uri, "about:blank")) + page_uri = uri; + data.page_uri = page_uri; + + if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, &data)) { + /* FIXME: Update image tooltip */ + soup_uri = soup_uri_new ("http://.invalid"); soup_message_set_uri (msg, soup_uri); soup_uri_free (soup_uri); @@ -530,22 +686,6 @@ adblock_session_request_queued_cb (SoupSession* session, } #endif -static gchar* -adblock_build_js (gchar* style) -{ - return g_strdup_printf ( - "window.addEventListener ('DOMContentLoaded'," - "function () {" - "var mystyle = document.createElement(\"style\");" - "mystyle.setAttribute(\"type\", \"text/css\");" - "mystyle.appendChild(document.createTextNode('%s'));" - "var head = document.getElementsByTagName(\"head\")[0];" - "if (head) head.appendChild(mystyle);" - "else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);" - "}, true);", - style); -} - static void adblock_window_object_cleared_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, @@ -557,26 +697,28 @@ adblock_window_object_cleared_cb (GtkWidget* web_view, static void adblock_add_tab_cb (MidoriBrowser* browser, - MidoriView* view) + MidoriView* view, + GtkWidget* image) { GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); g_signal_connect (web_view, "window-object-cleared", G_CALLBACK (adblock_window_object_cleared_cb), 0); #if HAVE_WEBKIT_RESOURCE_REQUEST g_signal_connect (web_view, "resource-request-starting", - G_CALLBACK (adblock_resource_request_starting_cb), view); + G_CALLBACK (adblock_resource_request_starting_cb), image); #endif } static void adblock_deactivate_cb (MidoriExtension* extension, - MidoriBrowser* browser); + GtkWidget* image); static void adblock_add_tab_foreach_cb (MidoriView* view, - MidoriBrowser* browser) + MidoriBrowser* browser, + GtkWidget* image) { - adblock_add_tab_cb (browser, view); + adblock_add_tab_cb (browser, view, image); } static void @@ -584,13 +726,88 @@ adblock_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension) { + GtkWidget* statusbar; + GtkWidget* image; + + statusbar = katze_object_get_object (browser, "statusbar"); + #if 0 + image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_box_pack_start (GTK_BOX (statusbar), image, FALSE, FALSE, 3); + #else + image = GTK_WIDGET (browser); + #endif + midori_browser_foreach (browser, - (GtkCallback)adblock_add_tab_foreach_cb, browser); - g_signal_connect (browser, "add-tab", G_CALLBACK (adblock_add_tab_cb), 0); + (GtkCallback)adblock_add_tab_foreach_cb, image); + g_signal_connect (browser, "add-tab", + G_CALLBACK (adblock_add_tab_cb), image); g_signal_connect (browser, "populate-tool-menu", G_CALLBACK (adblock_browser_populate_tool_menu_cb), extension); g_signal_connect (extension, "deactivate", - G_CALLBACK (adblock_deactivate_cb), browser); + G_CALLBACK (adblock_deactivate_cb), image); + g_object_unref (statusbar); +} + +static void +adblock_compile_regexp (GHashTable* tbl, + gchar* patt, + gchar* opts) +{ + GRegex* regex; + GError* error = NULL; + + /* TODO: Play with optimization flags */ + regex = g_regex_new (patt, G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, &error); + + if (!error) + g_hash_table_insert (tbl, opts, regex); + else + { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); + } +} + +static void +adblock_add_url_pattern (gchar* format, + gchar* type, + gchar* line) +{ + gchar** data; + gchar* patt; + gchar* fixed_patt; + gchar* format_patt; + gchar* opts; + + data = g_strsplit (line, "$", -1); + if (data && data[0] && data[1] && data[2]) + { + patt = g_strdup_printf ("%s%s", data[0], data[1]); + opts = g_strdup_printf ("type=%s,regexp=%s,%s", type, patt, data[2]); + } + else if (data && data[0] && data[1]) + { + patt = g_strdup (data[0]); + opts = g_strdup_printf ("type=%s,regexp=%s,%s", type, patt, data[1]); + } + else + { + patt = g_strdup (data[0]); + opts = g_strdup_printf ("type=%s,regexp=%s", type, patt); + } + + fixed_patt = adblock_fixup_regexp (patt); + format_patt = g_strdup_printf (format, fixed_patt); + + /* g_debug ("got: %s opts %s", format_patt, opts); */ + adblock_compile_regexp (pattern, format_patt, opts); + + g_strfreev (data); + g_free (patt); + g_free (fixed_patt); + g_free (format_patt); } static void @@ -600,11 +817,41 @@ adblock_frame_add (gchar* line) (void)*line++; (void)*line++; - new_blockcss = g_strdup_printf ("%s %s { display: none !important; }", - blockcss, line); + new_blockcss = g_strdup_printf ("%s, %s", blockcss, line); katze_assign (blockcss, new_blockcss); } +static void +adblock_frame_add_private (const gchar* line, + const gchar* sep) +{ + gchar* new_blockcss; + gchar** data; + data = g_strsplit (line, sep, 2); + + if (strstr (data[0],",")) + { + gchar** domains; + gint max, i; + + domains = g_strsplit (data[0], ",", -1); + for (max = i = 0; domains[i]; i++) + { + new_blockcss = g_strdup_printf ("%s;\nsites['%s']+=',%s'", + blockcssprivate, g_strstrip (domains[i]), data[1]); + katze_assign (blockcssprivate, new_blockcss); + } + g_strfreev (domains); + } + else + { + new_blockcss = g_strdup_printf ("%s;\nsites['%s']+=',%s'", + blockcssprivate, data[0], data[1]); + katze_assign (blockcssprivate, new_blockcss); + } + g_strfreev (data); +} + static gchar* adblock_parse_line (gchar* line) { @@ -617,97 +864,108 @@ adblock_parse_line (gchar* line) /* FIXME: No support for whitelisting */ if (line[0] == '@' && line[1] == '@') return NULL; - /* FIXME: What is this? */ - if (line[0] == '|' && line[1] == '|') - return NULL; - /* ditto */ - if (strstr (line,"$")) + /* FIXME: No support for [include] and [exclude] tags */ + if (line[0] == '[') return NULL; - /* Got block hider */ - if (line[0] == '#' && line[1] == '#' && (line[2] == '.'||line[2] == '#'||line[2] == 'a')) + + /* Got CSS block hider */ + if (line[0] == '#' && line[1] == '#' ) { adblock_frame_add (line); return NULL; } - /* FIXME: Do we have smth else starting with ##? */ - if (line[0] == '#' && line[1] == '#') + /* Got CSS block hider. Workaround */ + if (line[0] == '#') return NULL; - /* FIXME: No support for per domain element hiding */ + + /* Got per domain CSS hider rule */ if (strstr (line,"##")) + { + adblock_frame_add_private (line,"##"); return NULL; - /* FIXME: No support for [include] and [exclude] tags */ - if (line[0] == '[') + } + + /* Got per domain CSS hider rule. Workaround */ + if (strstr (line,"#")) + { + adblock_frame_add_private (line,"#"); return NULL; - return adblock_fixup_regexp (line); + } + /* Got URL blocker rule */ + if (line[0] == '|' && line[1] == '|' ) + { + (void)*line++; + (void)*line++; + adblock_add_url_pattern ("^https?://([a-z0-9\\.]+)?%s", "fulluri", line); + return NULL; + } + if (line[0] == '|') + { + (void)*line++; + adblock_add_url_pattern ("^%s", "fulluri", line); + return NULL; + } + adblock_add_url_pattern ("%s", "uri", line); + return line; } static void adblock_parse_file (gchar* path) { FILE* file; + gchar line[500]; + if ((file = g_fopen (path, "r"))) { - gchar line[500]; - GRegex* regex; - while (fgets (line, 500, file)) - { - GError* error = NULL; - gchar* parsed; - - parsed = adblock_parse_line (line); - if (!parsed) - continue; - - regex = g_regex_new (parsed, G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, &error); - if (error) - { - g_warning ("%s: %s", G_STRFUNC, error->message); - g_error_free (error); - g_free (parsed); - } - else - g_hash_table_insert (pattern, parsed, regex); - } - katze_assign (blockscript, adblock_build_js (blockcss)); + adblock_parse_line (line); fclose (file); } } static void -adblock_deactivate_tabs (MidoriView* view, - MidoriBrowser* browser) +adblock_deactivate_tabs (MidoriView* view, + GtkWidget* image) { GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); + MidoriBrowser* browser = midori_browser_get_for_widget (image); + g_signal_handlers_disconnect_by_func ( browser, adblock_add_tab_cb, 0); g_signal_handlers_disconnect_by_func ( web_view, adblock_window_object_cleared_cb, 0); #if HAVE_WEBKIT_RESOURCE_REQUEST g_signal_handlers_disconnect_by_func ( - web_view, adblock_resource_request_starting_cb, view); - #else - g_signal_handlers_disconnect_by_func ( - webkit_get_default_session (), adblock_session_request_queued_cb, NULL); + web_view, adblock_resource_request_starting_cb, image); + #endif + #if 0 + gtk_widget_destroy (image); #endif } static void adblock_deactivate_cb (MidoriExtension* extension, - MidoriBrowser* browser) + GtkWidget* image) { + MidoriBrowser* browser = midori_browser_get_for_widget (image); MidoriApp* app = midori_extension_get_app (extension); + #if !HAVE_WEBKIT_RESOURCE_REQUEST + g_signal_handlers_disconnect_matched (webkit_get_default_session (), + G_SIGNAL_MATCH_FUNC, + g_signal_lookup ("request-queued", SOUP_TYPE_SESSION), 0, + NULL, adblock_session_request_queued_cb, NULL); + #endif g_signal_handlers_disconnect_by_func ( browser, adblock_browser_populate_tool_menu_cb, extension); g_signal_handlers_disconnect_by_func ( extension, adblock_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, adblock_app_add_browser_cb, extension); - midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, browser); + midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, image); katze_assign (blockcss, NULL); + katze_assign (blockcssprivate, NULL); g_hash_table_destroy (pattern); } @@ -768,6 +1026,7 @@ test_adblock_pattern (void) temp = g_file_open_tmp ("midori_adblock_match_test_XXXXXX", &filename, NULL); + /* TODO: Update some tests and add new ones. */ g_file_set_contents (filename, "*ads.foo.bar*\n" "*ads.bogus.name*\n" diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index 69f584fd..e63e843f 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -23,12 +23,6 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, GdkColor color; label = midori_view_get_proxy_tab_label (view); - if (!midori_extension_get_boolean (extension, "tint")) - { - gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); - return; - } /* Find a color that is unique to an address. We merely compute a hash value, pick the first 6 + 1 characters and turn the @@ -60,45 +54,35 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); } } - -static void -colorful_tabs_browser_foreach_cb (GtkWidget* view, - MidoriExtension* extension) -{ - colorful_tabs_view_notify_uri_cb (MIDORI_VIEW (view), NULL, extension); -} - -static void -colorful_tabs_button_toggled_cb (GtkWidget* button, - MidoriExtension* extension) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (button); - - midori_extension_set_boolean (extension, "tint", - !midori_extension_get_boolean (extension, "tint")); - midori_browser_foreach (browser, - (GtkCallback)colorful_tabs_browser_foreach_cb, extension); -} - static void colorful_tabs_browser_add_tab_cb (MidoriBrowser* browser, - MidoriView* view, + GtkWidget* view, MidoriExtension* extension) { + colorful_tabs_view_notify_uri_cb (MIDORI_VIEW (view), NULL, extension); g_signal_connect (view, "notify::uri", G_CALLBACK (colorful_tabs_view_notify_uri_cb), extension); } static void colorful_tabs_deactivate_cb (MidoriExtension* extension, - GtkWidget* bbox) + MidoriBrowser* browser) { + guint i; + GtkWidget* view; + g_signal_handlers_disconnect_by_func ( - extension, colorful_tabs_deactivate_cb, bbox); - /* FIXME: Disconnect signals */ - midori_browser_foreach (midori_browser_get_for_widget (bbox), - (GtkCallback)colorful_tabs_browser_foreach_cb, extension); - gtk_widget_destroy (bbox); + extension, colorful_tabs_deactivate_cb, browser); + i = 0; + while ((view = midori_browser_get_nth_tab (browser, i++))) + { + GtkWidget* label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), FALSE); + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); + g_signal_handlers_disconnect_by_func ( + view, colorful_tabs_view_notify_uri_cb, extension); + } } static void @@ -106,26 +90,16 @@ colorful_tabs_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension) { - GtkWidget* statusbar; - GtkWidget* bbox; - GtkWidget* button; - - statusbar = katze_object_get_object (browser, "statusbar"); - bbox = gtk_hbox_new (FALSE, 0); - button = gtk_check_button_new_with_label (_("Tint tabs distinctly")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - midori_extension_get_boolean (extension, "tint")); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - gtk_widget_show (button); - gtk_widget_show (bbox); - gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); - - g_signal_connect (button, "toggled", - G_CALLBACK (colorful_tabs_button_toggled_cb), extension); + guint i; + GtkWidget* view; + + i = 0; + while ((view = midori_browser_get_nth_tab (browser, i++))) + colorful_tabs_browser_add_tab_cb (browser, view, extension); g_signal_connect (browser, "add-tab", G_CALLBACK (colorful_tabs_browser_add_tab_cb), extension); g_signal_connect (extension, "deactivate", - G_CALLBACK (colorful_tabs_deactivate_cb), bbox); + G_CALLBACK (colorful_tabs_deactivate_cb), browser); } static void @@ -142,6 +116,8 @@ colorful_tabs_activate_cb (MidoriExtension* extension, colorful_tabs_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (colorful_tabs_app_add_browser_cb), extension); + + g_object_unref (browsers); } MidoriExtension* @@ -153,7 +129,6 @@ extension_init (void) "version", "0.1", "authors", "Christian Dywan ", NULL); - midori_extension_install_boolean (extension, "tint", FALSE); g_signal_connect (extension, "activate", G_CALLBACK (colorful_tabs_activate_cb), NULL); diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index bbef14f6..eacb56ab 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -91,7 +91,7 @@ feed_panel_treeview_render_icon_cb (GtkTreeViewColumn* column, uri = katze_item_get_uri (pitem); if (uri) { - pixbuf = katze_net_load_icon (panel->net, uri, NULL, NULL, NULL); + pixbuf = katze_load_cached_icon (uri, NULL); if (!pixbuf) pixbuf = panel->pixbuf; } @@ -509,8 +509,11 @@ feed_panel_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { MidoriBrowser* browser; + MidoriBrowser* new_browser; + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); - g_signal_emit_by_name (browser, "new-window", uri); + g_signal_emit_by_name (browser, "new-window", NULL, &new_browser); + midori_browser_add_uri (new_browser, uri); } } @@ -550,8 +553,8 @@ feed_panel_popup (GtkWidget* widget, item, feed_panel_delete_activate_cb, panel); } - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), + event, KATZE_MENU_POSITION_CURSOR); } static gboolean diff --git a/extensions/formhistory.c b/extensions/formhistory.c index 0cb119ca..8e1a2cc4 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -1,5 +1,6 @@ /* Copyright (C) 2009 Alexander Butenko + Copyright (C) 2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -7,18 +8,23 @@ version 2.1 of the License, or (at your option) any later version. */ -#define MAXCHARS 20 +#define MAXCHARS 60 #define MINCHARS 2 #include #include "config.h" +#include "midori/sokoke.h" #include #if HAVE_UNISTD_H #include #endif +#if HAVE_SQLITE + #include +#endif + static GHashTable* global_keys; static gchar* jsforms; @@ -30,7 +36,7 @@ formhistory_prepare_js () guint i; gchar* file; - gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, NULL); + gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, "res", NULL); file = g_build_filename (data_path,"/autosuggestcontrol.js",NULL); if (!g_file_test (file, G_FILE_TEST_EXISTS)) return FALSE; @@ -72,6 +78,22 @@ formhistory_prepare_js () return TRUE; } +static gchar* +formhistory_fixup_value (char* value) +{ + guint i = 0; + g_strchomp (value); + while (value[i]) + { + if (value[i] == '\n') + value[i] = ' '; + else if (value[i] == '"') + value[i] = '\''; + i++; + } + return value; +} + static gchar* formhistory_build_js () { @@ -95,71 +117,173 @@ formhistory_build_js () suggestions, jsforms); g_free (suggestions); - return script; + return script; } static void -formhistory_update_main_hash (GHashTable* keys) +formhistory_update_database (gpointer db, + const gchar* key, + const gchar* value) { - GHashTableIter iter; - gchar* key; - gchar* value; - - g_hash_table_iter_init (&iter, keys); - while (g_hash_table_iter_next (&iter, (gpointer)&key, (gpointer)&value)) + #if HAVE_SQLITE + gchar* sqlcmd; + gchar* errmsg; + gint success; + + sqlcmd = sqlite3_mprintf ("INSERT INTO forms VALUES" + "('%q', '%q', '%q')", + NULL, key, value); + success = sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg); + sqlite3_free (sqlcmd); + if (success != SQLITE_OK) { - guint length; - gchar* tmp; + g_printerr (_("Failed to add form value: %s\n"), errmsg); + g_free (errmsg); + return; + } + #endif +} - if (!(value && *value)) - continue; - length = strlen (value); - if (length > MAXCHARS || length < MINCHARS) - continue; +static gboolean +formhistory_update_main_hash (gchar* key, + gchar* value) +{ + guint length; + gchar* tmp; - tmp = g_hash_table_lookup (global_keys, (gpointer)key); - if (tmp) + if (!(value && *value)) + return FALSE; + length = strlen (value); + if (length > MAXCHARS || length < MINCHARS) + return FALSE; + + formhistory_fixup_value (value); + if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key))) + { + gchar* rvalue = g_strdup_printf ("\"%s\"",value); + if (!g_regex_match_simple (rvalue, tmp, + G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) { - gchar* rvalue = g_strdup_printf ("\"%s\"",value); - if (!g_regex_match_simple (rvalue, tmp, - G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) - { - gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue); - g_hash_table_replace (global_keys, key, new_value); - } + gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue); + g_hash_table_insert (global_keys, g_strdup (key), new_value); g_free (rvalue); } else { - gchar* new_value = g_strdup_printf ("\"%s\",",value); - g_hash_table_insert (global_keys, key, new_value); + g_free (rvalue); + return FALSE; } } + else + { + gchar* new_value = g_strdup_printf ("\"%s\",",value); + g_hash_table_replace (global_keys, g_strdup (key), new_value); + } + return TRUE; } +#if WEBKIT_CHECK_VERSION (1, 1, 4) +static gboolean +formhistory_navigation_decision_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request, + WebKitWebNavigationAction* action, + WebKitWebPolicyDecision* decision, + MidoriExtension* extension) +{ + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + /* The script returns form data in the form "field_name|,|value|,|field_type". + We are handling only input fields with 'text' or 'password' type. + The field separator is "|||" */ + const gchar* script = "function dumpForm (inputs) {" + " var out = '';" + " for (i=0;irequest_headers; - const gchar* referer; */ SoupMessageBody* body = msg->request_body; if (soup_message_body_get_accumulate (body)) { - SoupBuffer* buffer = soup_message_body_flatten (body); - GHashTable* keys = soup_form_decode (body->data); - formhistory_update_main_hash (keys); + SoupBuffer* buffer; + GHashTable* keys; + gpointer db; + + buffer = soup_message_body_flatten (body); + keys = soup_form_decode (body->data); + + db = g_object_get_data (G_OBJECT (extension), "formhistory-db"); + formhistory_feed_keys (keys, db); soup_buffer_free (buffer); + g_hash_table_destroy (keys); } - /* FIXME: Need a permanent storage implementation */ - /* referer = soup_message_headers_get_one (hdrs, "Referer"); */ } g_free (method); } - +#endif static void formhistory_window_object_cleared_cb (GtkWidget* web_view, @@ -172,15 +296,20 @@ formhistory_window_object_cleared_cb (GtkWidget* web_view, } static void -formhistory_add_tab_cb (MidoriBrowser* browser, - MidoriView* view) +formhistory_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) { GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); - SoupSession *session = webkit_get_default_session (); g_signal_connect (web_view, "window-object-cleared", - G_CALLBACK (formhistory_window_object_cleared_cb), 0); - g_signal_connect (session, "request-queued", - G_CALLBACK (formhistory_session_request_queued_cb), 0); + G_CALLBACK (formhistory_window_object_cleared_cb), NULL); + #if WEBKIT_CHECK_VERSION (1, 1, 4) + g_signal_connect (web_view, "navigation-policy-decision-requested", + G_CALLBACK (formhistory_navigation_decision_cb), extension); + #else + g_signal_connect (webkit_get_default_session (), "request-queued", + G_CALLBACK (formhistory_session_request_queued_cb), extension); + #endif } static void @@ -188,10 +317,11 @@ formhistory_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser); static void -formhistory_add_tab_foreach_cb (MidoriView* view, - MidoriBrowser* browser) +formhistory_add_tab_foreach_cb (MidoriView* view, + MidoriBrowser* browser, + MidoriExtension* extension) { - formhistory_add_tab_cb (browser, view); + formhistory_add_tab_cb (browser, view, extension); } static void @@ -200,24 +330,30 @@ formhistory_app_add_browser_cb (MidoriApp* app, MidoriExtension* extension) { midori_browser_foreach (browser, - (GtkCallback)formhistory_add_tab_foreach_cb, browser); - g_signal_connect (browser, "add-tab", G_CALLBACK (formhistory_add_tab_cb), 0); + (GtkCallback)formhistory_add_tab_foreach_cb, extension); + g_signal_connect (browser, "add-tab", + G_CALLBACK (formhistory_add_tab_cb), extension); g_signal_connect (extension, "deactivate", G_CALLBACK (formhistory_deactivate_cb), browser); } static void -formhistory_deactivate_tabs (MidoriView* view, - MidoriBrowser* browser) +formhistory_deactivate_tabs (MidoriView* view, + MidoriBrowser* browser, + MidoriExtension* extension) { GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); - SoupSession *session = webkit_get_default_session (); g_signal_handlers_disconnect_by_func ( - browser, formhistory_add_tab_cb, 0); + browser, formhistory_add_tab_cb, extension); + g_signal_handlers_disconnect_by_func ( + web_view, formhistory_window_object_cleared_cb, NULL); + #if WEBKIT_CHECK_VERSION (1, 1, 4) g_signal_handlers_disconnect_by_func ( - web_view, formhistory_window_object_cleared_cb, 0); + web_view, formhistory_navigation_decision_cb, extension); + #else g_signal_handlers_disconnect_by_func ( - session, formhistory_session_request_queued_cb, 0); + webkit_get_default_session (), formhistory_session_request_queued_cb, extension); + #endif } static void @@ -225,22 +361,67 @@ formhistory_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser) { MidoriApp* app = midori_extension_get_app (extension); + #if HAVE_SQLITE + sqlite3* db; + #endif g_signal_handlers_disconnect_by_func ( extension, formhistory_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, formhistory_app_add_browser_cb, extension); - midori_browser_foreach (browser, (GtkCallback)formhistory_deactivate_tabs, browser); + midori_browser_foreach (browser, + (GtkCallback)formhistory_deactivate_tabs, extension); jsforms = ""; if (global_keys) g_hash_table_destroy (global_keys); + + #if HAVE_SQLITE + if ((db = g_object_get_data (G_OBJECT (extension), "formhistory-db"))) + sqlite3_close (db); + #endif } +#if HAVE_SQLITE +static int +formhistory_add_field (gpointer data, + int argc, + char** argv, + char** colname) +{ + gint i; + gint ncols = 3; + + /* Test whether have the right number of columns */ + g_return_val_if_fail (argc % ncols == 0, 1); + + for (i = 0; i < (argc - ncols) + 1; i++) + { + if (argv[i]) + { + if (colname[i] && !g_ascii_strcasecmp (colname[i], "domain") + && colname[i + 1] && !g_ascii_strcasecmp (colname[i + 1], "field") + && colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "value")) + { + gchar* key = argv[i + 1]; + formhistory_update_main_hash (g_strdup (key), g_strdup (argv[i + 2])); + } + } + } + return 0; +} +#endif + static void formhistory_activate_cb (MidoriExtension* extension, MidoriApp* app) { + #if HAVE_SQLITE + const gchar* config_dir; + gchar* filename; + sqlite3* db; + char* errmsg = NULL, *errmsg2 = NULL; + #endif KatzeArray* browsers; MidoriBrowser* browser; guint i; @@ -248,6 +429,39 @@ formhistory_activate_cb (MidoriExtension* extension, global_keys = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free); + #if HAVE_SQLITE + config_dir = midori_extension_get_config_dir (extension); + katze_mkdir_with_parents (config_dir, 0700); + filename = g_build_filename (config_dir, "forms.db", NULL); + if (sqlite3_open (filename, &db)) + { + g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db)); + sqlite3_close (db); + } + g_free (filename); + if ((sqlite3_exec (db, "CREATE TABLE IF NOT EXISTS " + "forms (domain text, field text, value text)", + NULL, NULL, &errmsg) == SQLITE_OK) + && (sqlite3_exec (db, "SELECT domain, field, value FROM forms ", + formhistory_add_field, + NULL, &errmsg2) == SQLITE_OK)) + g_object_set_data (G_OBJECT (extension), "formhistory-db", db); + else + { + if (errmsg) + { + g_critical (_("Failed to execute database statement: %s\n"), errmsg); + sqlite3_free (errmsg); + if (errmsg2) + { + g_critical (_("Failed to execute database statement: %s\n"), errmsg2); + sqlite3_free (errmsg2); + } + } + sqlite3_close (db); + } + #endif + browsers = katze_object_get_object (app, "browsers"); i = 0; while ((browser = katze_array_get_nth_item (browsers, i++))) @@ -278,8 +492,10 @@ MidoriExtension* extension_init (void) { gboolean should_init = TRUE; - gchar* ver; + const gchar* ver; gchar* desc; + MidoriExtension* extension; + if (formhistory_prepare_js ()) { ver = "0.1"; @@ -292,7 +508,8 @@ extension_init (void) ver = NULL; should_init = FALSE; } - MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + + extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Form history filler"), "description", desc, "version", ver, diff --git a/extensions/mouse-gestures.c b/extensions/mouse-gestures.c new file mode 100644 index 00000000..eedaa572 --- /dev/null +++ b/extensions/mouse-gestures.c @@ -0,0 +1,298 @@ +/* + Copyright (C) 2009 Matthias Kruk + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +typedef struct _MouseGesture MouseGesture; +typedef enum _MouseButton MouseButton; + +enum _MouseButton { + MOUSE_BUTTON_LEFT = 1, + MOUSE_BUTTON_RIGHT = 3, + MOUSE_BUTTON_MIDDLE = 2, + MOUSE_BUTTON_UNSET = 0 +}; + +struct MouseGestureNode { + double x; + double y; +} MouseGestureNode_t; + +struct _MouseGesture { + struct MouseGestureNode start; + struct MouseGestureNode middle; + struct MouseGestureNode end; + MouseButton last; +}; + +#define DEVIANCE 20 +#define MINLENGTH 50 + +#define MOUSE_GESTURES_BUTTON MOUSE_BUTTON_MIDDLE + +MouseGesture *gesture; + +void mouse_gesture_clear (MouseGesture *g) +{ + g->start.x = 0; + g->start.y = 0; + g->middle.x = 0; + g->middle.y = 0; + g->end.x = 0; + g->end.y = 0; + g->last = MOUSE_BUTTON_UNSET; +} + +MouseGesture* mouse_gesture_new (void) +{ + MouseGesture* g = g_new (MouseGesture, 1); + mouse_gesture_clear (g); + + return g; +} + +static gboolean +mouse_gestures_button_press_event_cb (GtkWidget* web_view, + GdkEvent* event, + MidoriBrowser* browser) +{ + if (event->button.button == MOUSE_GESTURES_BUTTON) + { + /* If the gesture was previously cleaned, + start a new gesture and coordinates. */ + if (gesture->last == MOUSE_BUTTON_UNSET) + { + gesture->start.x = event->button.x; + gesture->start.y = event->button.y; + gesture->last = event->button.button; + } + return TRUE; + } + + return FALSE; +} + +static gboolean +mouse_gestures_motion_notify_event_cb (GtkWidget* web_view, + GdkEvent* event, + MidoriBrowser* browser) +{ + if (gesture->last != MOUSE_BUTTON_UNSET) + { + guint x, y; + + x = event->motion.x; + y = event->motion.y; + + if ((gesture->start.x - x < DEVIANCE && gesture->start.x - x > -DEVIANCE) || + (gesture->start.y - y < DEVIANCE && gesture->start.y - y > -DEVIANCE)) + { + gesture->middle.x = x; + gesture->middle.y = y; + } + else if ((gesture->middle.x - x < DEVIANCE && gesture->middle.x - x > -DEVIANCE) || + (gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE)) + { + gesture->end.x = x; + gesture->end.y = y; + } + + return TRUE; + } + + return FALSE; +} + +static gboolean +mouse_gestures_button_release_event_cb (GtkWidget* web_view, + GdkEvent* event, + MidoriBrowser* browser) +{ + /* All mouse gestures will use this mouse button */ + if (gesture->last == MOUSE_GESTURES_BUTTON) + { + /* The initial horizontal move is between the bounds */ + if ((gesture->middle.x - gesture->start.x < DEVIANCE) && + (gesture->middle.x - gesture->start.x > -DEVIANCE)) + { + /* We initially moved down more than MINLENGTH pixels */ + if (gesture->middle.y > gesture->start.y + MINLENGTH) + { + /* Then we the final vertical move is between the bounds and + we moved right more than MINLENGTH pixels */ + if ((gesture->middle.y - gesture->end.y < DEVIANCE) && + (gesture->middle.y - gesture->end.y > -DEVIANCE) && + (gesture->end.x > gesture->middle.x + MINLENGTH)) + /* We moved down then right: close the tab */ + midori_browser_activate_action (browser, "TabClose"); + /* Then we the final vertical move is between the bounds and + we moved left more than MINLENGTH pixels */ + else if ((gesture->middle.y - gesture->end.y < DEVIANCE) && + (gesture->middle.y - gesture->end.y > -DEVIANCE) && + (gesture->end.x + MINLENGTH < gesture->middle.x)) + /* We moved down then left: reload */ + midori_browser_activate_action (browser, "Reload"); + /* The end node was never updated, we only did a vertical move */ + else if(gesture->end.y == 0 && gesture->end.x == 0) + /* We moved down then: create a new tab */ + midori_browser_activate_action (browser, "TabNew"); + } + /* We initially moved up more than MINLENGTH pixels */ + else if (gesture->middle.y + MINLENGTH < gesture->start.y) + { + /* The end node was never updated, we only did a vertical move */ + if (gesture->end.y == 0 && gesture->end.x == 0) + /* We moved up: stop */ + midori_browser_activate_action (browser, "Stop"); + } + } + /* The initial horizontal move is between the bounds */ + else if ((gesture->middle.y - gesture->start.y < DEVIANCE) && + (gesture->middle.y - gesture->start.y > -DEVIANCE)) + { + /* We initially moved right more than MINLENGTH pixels */ + if (gesture->middle.x > gesture->start.x + MINLENGTH) + { + /* The end node was never updated, we only did an horizontal move */ + if (gesture->end.x == 0 && gesture->end.y == 0) + /* We moved right: forward */ + midori_browser_activate_action (browser, "Forward"); + } + /* We initially moved left more than MINLENGTH pixels */ + else if (gesture->middle.x + MINLENGTH < gesture->start.x) + { + /* The end node was never updated, we only did an horizontal move */ + if (gesture->end.x == 0 && gesture->end.y == 0) + /* We moved left: back */ + midori_browser_activate_action (browser, "Back"); + } + } + + mouse_gesture_clear (gesture); + + return TRUE; + } + + return FALSE; +} + +static void +mouse_gestures_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) +{ + GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); + + g_object_connect (web_view, + "signal::button-press-event", + mouse_gestures_button_press_event_cb, browser, + "signal::motion-notify-event", + mouse_gestures_motion_notify_event_cb, browser, + "signal::button-release-event", + mouse_gestures_button_release_event_cb, browser, + NULL); +} + +static void +mouse_gestures_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser); + +static void +mouse_gestures_add_tab_foreach_cb (MidoriView* view, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + mouse_gestures_add_tab_cb (browser, view, extension); +} + +static void +mouse_gestures_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + midori_browser_foreach (browser, + (GtkCallback)mouse_gestures_add_tab_foreach_cb, extension); + g_signal_connect (browser, "add-tab", + G_CALLBACK (mouse_gestures_add_tab_cb), extension); + g_signal_connect (extension, "deactivate", + G_CALLBACK (mouse_gestures_deactivate_cb), browser); +} + +static void +mouse_gestures_deactivate_tabs (MidoriView* view, + MidoriBrowser* browser) +{ + GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); + + g_object_disconnect (web_view, + "any_signal::button-press-event", + mouse_gestures_button_press_event_cb, browser, + "any_signal::motion-notify-event", + mouse_gestures_motion_notify_event_cb, browser, + "any_signal::button-release-event", + mouse_gestures_button_release_event_cb, browser, + NULL); +} + +static void +mouse_gestures_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + + g_signal_handlers_disconnect_by_func ( + extension, mouse_gestures_deactivate_cb, browser); + g_signal_handlers_disconnect_by_func ( + app, mouse_gestures_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, mouse_gestures_add_tab_cb, extension); + midori_browser_foreach (browser, + (GtkCallback)mouse_gestures_deactivate_tabs, browser); + + g_free (gesture); +} + +static void +mouse_gestures_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + gesture = mouse_gesture_new (); + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + mouse_gestures_app_add_browser_cb (app, browser, extension); + g_signal_connect (app, "add-browser", + G_CALLBACK (mouse_gestures_app_add_browser_cb), extension); + + g_object_unref (browsers); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Mouse Gestures"), + "description", _("Control Midori by moving the mouse"), + "version", "0.1", + "authors", "Matthias Kruk ", NULL); + midori_extension_install_integer (extension, "button", MOUSE_GESTURES_BUTTON); + + g_signal_connect (extension, "activate", + G_CALLBACK (mouse_gestures_activate_cb), NULL); + + return extension; +} diff --git a/extensions/mouse-gestures/main.c b/extensions/mouse-gestures/main.c deleted file mode 100644 index cd39a283..00000000 --- a/extensions/mouse-gestures/main.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - Copyright (C) 2009 Matthias Kruk - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include -#include "mouse-gestures.h" - -#define MOUSE_GESTURES_VERSION "0.1" -#define DEVIANCE 20 -#define MINLENGTH 50 - -/* #define __MOUSE_GESTURES_DEBUG__ */ - -MouseGesture *gesture; - -void mouse_gesture_clear (MouseGesture *g) -{ - g->start.x = 0; - g->start.y = 0; - g->middle.x = 0; - g->middle.y = 0; - g->end.x = 0; - g->end.y = 0; - g->last = MOUSE_BUTTON_UNSET; -} - -MouseGesture* mouse_gesture_new (void) -{ - MouseGesture *g = g_new (MouseGesture, 1); - mouse_gesture_clear (g); - - return g; -} - -static gboolean mouse_gestures_handle_events (GtkWidget *widget, - GdkEvent *event, - MidoriBrowser *browser) -{ - /* A button was pressed */ - if (event->type == GDK_BUTTON_PRESS && event->button.button == 2) - { - /* If the gesture was previously cleaned, start a new gesture and coordinates */ - if (gesture->last == MOUSE_BUTTON_UNSET) - { - gesture->start.x = event->button.x; - gesture->start.y = event->button.y; - gesture->last = event->button.button; - } - - return TRUE; - } - else if (event->type == GDK_MOTION_NOTIFY) - { - if (gesture->last != MOUSE_BUTTON_UNSET) - { - guint x, y; - - x = event->motion.x; - y = event->motion.y; - - if ((gesture->start.x - x < DEVIANCE && gesture->start.x - x > -DEVIANCE) || - (gesture->start.y - y < DEVIANCE && gesture->start.y - y > -DEVIANCE)) - { - gesture->middle.x = x; - gesture->middle.y = y; - } - else if ((gesture->middle.x - x < DEVIANCE && gesture->middle.x - x > -DEVIANCE) || - (gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE)) - { - gesture->end.x = x; - gesture->end.y = y; - } - } - - return TRUE; - } - else if (event->type == GDK_BUTTON_RELEASE) - { - /* All mouse gestures will use the middle mouse button */ - if (gesture->last == MOUSE_BUTTON_MIDDLE) - { - /* The initial horizontal move is between the bounds */ - if ((gesture->middle.x - gesture->start.x < DEVIANCE) && - (gesture->middle.x - gesture->start.x > -DEVIANCE)) - { - /* We initially moved down more than MINLENGTH pixels */ - if (gesture->middle.y > gesture->start.y + MINLENGTH) - { - /* Then we the final vertical move is between the bounds and - we moved right more than MINLENGTH pixels */ - if ((gesture->middle.y - gesture->end.y < DEVIANCE) && - (gesture->middle.y - gesture->end.y > -DEVIANCE) && - (gesture->end.x > gesture->middle.x + MINLENGTH)) - { - /* We moved down then right: close the tab */ - midori_browser_activate_action (browser, "TabClose"); - } - /* Then we the final vertical move is between the bounds and - we moved left more than MINLENGTH pixels */ - else if ((gesture->middle.y - gesture->end.y < DEVIANCE) && - (gesture->middle.y - gesture->end.y > -DEVIANCE) && - (gesture->end.x + MINLENGTH < gesture->middle.x)) - { - /* We moved down then left: reload */ - midori_browser_activate_action (browser, "Reload"); - } - /* The end node was never updated, we only did a vertical move */ - else if(gesture->end.y == 0 && gesture->end.x == 0) - { - /* We moved down then: create a new tab */ - midori_browser_activate_action (browser, "TabNew"); - } - } - /* We initially moved up more than MINLENGTH pixels */ - else if (gesture->middle.y + MINLENGTH < gesture->start.y) - { - /* The end node was never updated, we only did a vertical move */ - if (gesture->end.y == 0 && gesture->end.x == 0) - { - /* We moved up: stop */ - midori_browser_activate_action (browser, "Stop"); - } - } - } - /* The initial horizontal move is between the bounds */ - else if ((gesture->middle.y - gesture->start.y < DEVIANCE) && - (gesture->middle.y - gesture->start.y > -DEVIANCE)) - { - /* We initially moved right more than MINLENGTH pixels */ - if (gesture->middle.x > gesture->start.x + MINLENGTH) - { - /* The end node was never updated, we only did an horizontal move */ - if (gesture->end.x == 0 && gesture->end.y == 0) - { - /* We moved right: forward */ - midori_browser_activate_action (browser, "Forward"); - } - } - /* We initially moved left more than MINLENGTH pixels */ - else if (gesture->middle.x + MINLENGTH < gesture->start.x) - { - /* The end node was never updated, we only did an horizontal move */ - if (gesture->end.x == 0 && gesture->end.y == 0) - { - /* We moved left: back */ - midori_browser_activate_action (browser, "Back"); - } - } - } - } - - mouse_gesture_clear (gesture); - - return TRUE; - } - else - return FALSE; -} - -static void mouse_gestures_tab_cb (MidoriBrowser* browser, GtkWidget *view) -{ - g_signal_connect (view, "event", G_CALLBACK (mouse_gestures_handle_events), browser); -} - -static void mouse_gestures_browser_cb (MidoriApp *app, MidoriBrowser *browser) -{ - g_signal_connect (browser, "add-tab", G_CALLBACK (mouse_gestures_tab_cb), NULL); -} - -static void mouse_gestures_deactivate (MidoriExtension *extension, MidoriApp *app) -{ - gulong signal_id; - KatzeArray* browsers; - MidoriBrowser* browser; - guint i; - - signal_id = g_signal_handler_find (app, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - mouse_gestures_browser_cb, NULL); - - if (signal_id != 0) - g_signal_handler_disconnect (app, signal_id); - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) - { - gint j; - GtkWidget* notebook; - - signal_id = g_signal_handler_find (browser, G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, mouse_gestures_tab_cb, NULL); - if (signal_id != 0) - g_signal_handler_disconnect (browser, signal_id); - - notebook = katze_object_get_object (browser, "notebook"); - - for (j = 0; j < gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); j++) - { - GtkWidget *page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), j); - - signal_id = g_signal_handler_find (page, G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, mouse_gestures_handle_events, NULL); - - if (signal_id != 0) - g_signal_handler_disconnect (page, signal_id); - } - } - g_object_unref (browsers); - - g_signal_handlers_disconnect_by_func (extension, mouse_gestures_deactivate, app); - g_free (gesture); -} - -static void mouse_gestures_activate (MidoriExtension *extension, MidoriApp *app) -{ - KatzeArray* browsers; - MidoriBrowser* browser; - guint i; - - gesture = mouse_gesture_new (); - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) - mouse_gestures_browser_cb (app, browser); - g_object_unref (browsers); - - g_signal_connect (app, "add-browser", - G_CALLBACK (mouse_gestures_browser_cb), NULL); - g_signal_connect (extension, "deactivate", - G_CALLBACK (mouse_gestures_deactivate), app); -} - -MidoriExtension* extension_init (void) -{ - MidoriExtension* extension; - - extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Mouse Gestures"), - "description", _("Control Midori by moving the mouse"), - "version", MOUSE_GESTURES_VERSION, - "authors", "Matthias Kruk ", NULL); - - g_signal_connect (extension, "activate", - G_CALLBACK (mouse_gestures_activate), NULL); - - return extension; -} diff --git a/extensions/mouse-gestures/mouse-gestures.h b/extensions/mouse-gestures/mouse-gestures.h deleted file mode 100644 index 945c05ab..00000000 --- a/extensions/mouse-gestures/mouse-gestures.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (C) 2009 Matthias Kruk - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MOUSE_GESTURES_H__ -#define __MOUSE_GESTURES_H__ - -typedef struct _MouseGesture MouseGesture; -typedef enum _MouseButton MouseButton; - -enum _MouseButton { - MOUSE_BUTTON_LEFT = 1, - MOUSE_BUTTON_RIGHT = 3, - MOUSE_BUTTON_MIDDLE = 2, - MOUSE_BUTTON_UNSET = 0 -}; - -struct MouseGestureNode { - double x; - double y; -} MouseGestureNode_t; - -struct _MouseGesture { - struct MouseGestureNode start; - struct MouseGestureNode middle; - struct MouseGestureNode end; - MouseButton last; -}; - -#endif diff --git a/extensions/page-holder.c b/extensions/page-holder.c index 85abb66e..9c6f0f14 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -175,7 +175,7 @@ extension_init (void) MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Pageholder"), - "description", "", + "description", _("Keep one or multiple pages open in parallel to your tabs"), "version", "0.1", "authors", "Christian Dywan ", NULL); diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c index e555b97c..1c25508e 100644 --- a/extensions/shortcuts.c +++ b/extensions/shortcuts.c @@ -38,67 +38,6 @@ shortcuts_deactivate_cb (MidoriExtension* extension, app, shortcuts_app_add_browser_cb, extension); } -static void -shortcuts_preferences_render_text (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - MidoriExtension* extension) -{ - GtkAction* action; - gchar* label; - gchar* stripped; - - gtk_tree_model_get (model, iter, 0, &action, -1); - if ((label = katze_object_get_string (action, "label"))) - stripped = katze_strip_mnemonics (label); - else - { - GtkStockItem item; - g_object_get (action, "stock-id", &label, NULL); - if (gtk_stock_lookup (label, &item)) - stripped = katze_strip_mnemonics (item.label); - else - stripped = g_strdup (""); - } - g_free (label); - g_object_set (renderer, "text", stripped, NULL); - g_free (stripped); - g_object_unref (action); -} - -static void -shortcuts_preferences_render_accel (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - MidoriExtension* extension) -{ - GtkAction* action; - const gchar* accel_path; - GtkAccelKey key; - - gtk_tree_model_get (model, iter, 0, &action, -1); - accel_path = gtk_action_get_accel_path (action); - if (accel_path) - { - if (gtk_accel_map_lookup_entry (accel_path, &key)) - { - if (key.accel_key) - g_object_set (renderer, - "accel-key", key.accel_key, - "accel-mods", key.accel_mods, - NULL); - else - g_object_set (renderer, "text", _("None"), NULL); - } - g_object_set (renderer, "sensitive", TRUE, "editable", TRUE, NULL); - } - else - g_object_set (renderer, "text", "", "sensitive", FALSE, NULL); - g_object_unref (action); -} - static void shortcuts_accel_edited_cb (GtkCellRenderer* renderer, const gchar* tree_path, @@ -113,11 +52,19 @@ shortcuts_accel_edited_cb (GtkCellRenderer* renderer, { GtkAction* action; const gchar* accel_path; + GtkTreeIter child_iter; + GtkTreeModel* liststore; - gtk_tree_model_get (model, &iter, 0, &action, -1); + gtk_tree_model_get (model, &iter, 6, &action, -1); accel_path = gtk_action_get_accel_path (action); gtk_accel_map_change_entry (accel_path, accel_key, accel_mods, TRUE); + gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model), + &child_iter, &iter); + liststore = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model)); + gtk_list_store_set (GTK_LIST_STORE (liststore), + &child_iter, 1, accel_key, 2, accel_mods, -1); + g_object_unref (action); } } @@ -133,15 +80,58 @@ shortcuts_accel_cleared_cb (GtkCellRenderer* renderer, { GtkAction* action; const gchar* accel_path; + GtkTreeIter child_iter; + GtkTreeModel* liststore; - gtk_tree_model_get (model, &iter, 0, &action, -1); + gtk_tree_model_get (model, &iter, 6, &action, -1); accel_path = gtk_action_get_accel_path (action); gtk_accel_map_change_entry (accel_path, 0, 0, FALSE); + gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model), + &child_iter, &iter); + liststore = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model)); + gtk_list_store_set (GTK_LIST_STORE (liststore), + &child_iter, 1, 0, 2, 0, -1); + g_object_unref (action); } } +static gchar* +shortcuts_label_for_action (GtkAction* action) +{ + gchar* label; + gchar* stripped; + + if ((label = katze_object_get_string (action, "label"))) + stripped = katze_strip_mnemonics (label); + else + { + GtkStockItem item; + + g_object_get (action, "stock-id", &label, NULL); + if (gtk_stock_lookup (label, &item)) + stripped = katze_strip_mnemonics (item.label); + else + stripped = g_strdup (""); + } + + g_free (label); + return stripped; +} + +static gboolean +shortcuts_hotkey_for_action (GtkAction* action, + GtkAccelKey* key) +{ + const gchar* accel_path = gtk_action_get_accel_path (action); + if (accel_path) + if (gtk_accel_map_lookup_entry (accel_path, key)) + return TRUE; + + return FALSE; +} + static GtkWidget* shortcuts_get_preferences_dialog (MidoriExtension* extension) { @@ -153,10 +143,10 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) GtkWidget* xfce_heading; GtkWidget* hbox; GtkListStore* liststore; + GtkTreeModel* model; GtkWidget* treeview; GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_accel; + GtkCellRenderer* renderer; GtkWidget* scrolled; GtkActionGroup* action_group; GList* actions; @@ -190,26 +180,29 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 12); - liststore = gtk_list_store_new (1, GTK_TYPE_ACTION); - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + liststore = gtk_list_store_new (7, + G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN, + G_TYPE_STRING, GTK_TYPE_ACTION); + model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (liststore)); + treeview = gtk_tree_view_new_with_model (model); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); - renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_text, - (GtkTreeCellDataFunc)shortcuts_preferences_render_text, - extension, NULL); + renderer = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "text", 0); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); column = gtk_tree_view_column_new (); - renderer_accel = gtk_cell_renderer_accel_new (); - gtk_tree_view_column_pack_start (column, renderer_accel, TRUE); - gtk_tree_view_column_set_cell_data_func (column, renderer_accel, - (GtkTreeCellDataFunc)shortcuts_preferences_render_accel, - extension, NULL); - g_signal_connect (renderer_accel, "accel-edited", - G_CALLBACK (shortcuts_accel_edited_cb), liststore); - g_signal_connect (renderer_accel, "accel-cleared", - G_CALLBACK (shortcuts_accel_cleared_cb), liststore); + renderer = gtk_cell_renderer_accel_new (); + gtk_tree_view_column_pack_start (column, renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "accel-key", 1); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "accel-mods", 2); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "accel-mode", 3); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "sensitive", 4); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (column), renderer, "editable", 4); + g_signal_connect (renderer, "accel-edited", + G_CALLBACK (shortcuts_accel_edited_cb), model); + g_signal_connect (renderer, "accel-cleared", + G_CALLBACK (shortcuts_accel_cleared_cb), model); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), @@ -224,11 +217,22 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) i = 0; /* FIXME: Catch added and removed actions */ while ((action = g_list_nth_data (actions, i++))) + { + gchar* label = shortcuts_label_for_action (action); + GtkAccelKey key; + gboolean has_hotkey = shortcuts_hotkey_for_action (action, &key); gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), - NULL, G_MAXINT, 0, action, -1); + NULL, G_MAXINT, 0, label, 1, key.accel_key, 2, key.accel_mods, + 3, GTK_CELL_RENDERER_ACCEL_MODE_OTHER, + 4, has_hotkey, 6, action, -1); + g_free (label); + } g_list_free (actions); g_object_unref (liststore); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), + 0, GTK_SORT_ASCENDING); + g_object_unref (model); gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index df6c70d1..6fb1fc8f 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -196,8 +196,7 @@ tab_panel_popup (GtkWidget* widget, { GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (view)); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } static gboolean @@ -355,9 +354,12 @@ tab_panel_view_notify_title_cb (GtkWidget* view, GtkTreeIter iter; if (tab_panel_get_iter_for_view (model, &iter, view)) { + GtkWidget* label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); + GtkStyle* style = gtk_widget_get_style (label); gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 4, title, - 5, midori_view_get_label_ellipsize (MIDORI_VIEW (view)), -1); + 5, midori_view_get_label_ellipsize (MIDORI_VIEW (view)), + 6, &style->bg[GTK_STATE_NORMAL], -1); } } } @@ -421,7 +423,7 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser, gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter, NULL, page, 0, view, 1, GTK_STOCK_CLOSE, 2, buttons, - 3, icon, 4, title, 5, ellipsize , -1); + 3, icon, 4, title, 5, ellipsize, 6, NULL, -1); } if (!g_signal_handler_find (view, G_SIGNAL_MATCH_FUNC, @@ -499,8 +501,8 @@ tab_panel_app_add_browser_cb (MidoriApp* app, panel = katze_object_get_object (browser, "panel"); - model = gtk_tree_store_new (6, MIDORI_TYPE_VIEW, - G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); + model = gtk_tree_store_new (7, MIDORI_TYPE_VIEW, + G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, GDK_TYPE_COLOR); g_object_set_data (G_OBJECT (browser), "tab-panel-ext-model", model); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); @@ -514,18 +516,19 @@ tab_panel_app_add_browser_cb (MidoriApp* app, renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_pixbuf, - "pixbuf", 3, NULL); + "pixbuf", 3, "cell-background-gdk", 6, NULL); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_text, - "text", 4, "ellipsize", 5, NULL); + "text", 4, "ellipsize", 5, "cell-background-gdk", 6, NULL); gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_pixbuf, - "stock-id", 1, "follow-state", 2, "visible", 2, NULL); + "stock-id", 1, "follow-state", 2, + "visible", 2, "cell-background-gdk", 6, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_object_connect (treeview, "signal::row-activated", diff --git a/extensions/tab-switcher.c b/extensions/tab-switcher.c new file mode 100644 index 00000000..d4749e83 --- /dev/null +++ b/extensions/tab-switcher.c @@ -0,0 +1,415 @@ +/* + Copyright (C) 2009 André Stösel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +enum { TAB_ICON, TAB_NAME, TAB_POINTER, TAB_CELL_COUNT }; + +static MidoriExtension *thisExtension; +static gboolean switchEvent; + +static GdkPixbuf* tab_selector_get_snapshot(MidoriView* view, + gint maxwidth, + gint maxheight) +{ + GtkWidget* web_view; + guint width, height; + gfloat factor; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + web_view = gtk_bin_get_child (GTK_BIN (view)); + + if(maxwidth < 0) { + maxwidth *= -1; + } + if(maxheight < 0) { + maxheight *= -1; + } + + factor = MIN((gfloat) maxwidth / web_view->allocation.width, (gfloat) maxheight / web_view->allocation.height); + width = (int)(factor * web_view->allocation.width); + height = (int)(factor * web_view->allocation.height); + + return midori_view_get_snapshot(view, width, height); +} + +static void tab_selector_list_foreach (GtkWidget *view, + GtkListStore *store) +{ + GtkTreeIter it; + GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); + const gchar *title = midori_view_get_display_title (MIDORI_VIEW (view)); + gtk_list_store_append (store, &it); + gtk_list_store_set (store, &it, TAB_ICON, icon, -1); + gtk_list_store_set (store, &it, TAB_NAME, title, -1); + gtk_list_store_set (store, &it, TAB_POINTER, view, -1); +} + +static GtkWidget* tab_selector_init_window (MidoriBrowser *browser) +{ + GList *list; + gint col_offset; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkWidget *window, *treeview, *sw, *hbox; + GtkListStore *store; + GtkWidget *page; + GtkWidget *image; + GdkPixbuf *snapshot; + + window = gtk_window_new(GTK_WINDOW_POPUP); + gtk_window_set_default_size(GTK_WINDOW(window), 320, 20); + gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); + + + hbox = gtk_hbox_new(FALSE, 1); + gtk_container_add(GTK_CONTAINER(window), hbox); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 1); + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + + gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0); + + store = gtk_list_store_new(TAB_CELL_COUNT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + g_object_set_data(G_OBJECT(window), "tab_selector_treeview", treeview); + + list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + g_list_foreach(list, (GFunc) tab_selector_list_foreach, store); + + g_object_unref(store); + g_object_set(treeview, "headers-visible", FALSE, NULL); + + renderer = gtk_cell_renderer_pixbuf_new(); + + gtk_tree_view_insert_column_with_attributes( + GTK_TREE_VIEW(treeview), -1, "Icon", renderer, "pixbuf", TAB_ICON, NULL); + + renderer = gtk_cell_renderer_text_new(); + + col_offset = gtk_tree_view_insert_column_with_attributes( + GTK_TREE_VIEW(treeview), -1, "Title", renderer, "text", TAB_NAME, NULL); + column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1); + gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), + midori_extension_get_integer(thisExtension, "TitleColumnWidth")); + + gtk_container_add (GTK_CONTAINER (sw), treeview); + + page = katze_object_get_object(browser, "tab"); + snapshot = tab_selector_get_snapshot(MIDORI_VIEW(page), + midori_extension_get_integer(thisExtension, "TabPreviewWidth"), + midori_extension_get_integer(thisExtension, "TabPreviewHeight")); + image = gtk_image_new_from_pixbuf (snapshot); + gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0); + g_object_set_data(G_OBJECT(window), "tab_selector_image", image); + + gtk_widget_show_all(window); + + return window; +} + +static void tab_selector_window_walk ( GtkWidget *window, + GdkEventKey *event, + MidoriBrowser *browser) +{ + gint *pindex, iindex, items; + GtkWidget *view; + GtkTreeIter iter; + GtkTreePath *path; + GtkTreeView *treeview; + GtkTreeModel *model; + GtkTreeViewColumn *column; + + treeview = g_object_get_data (G_OBJECT (window), "tab_selector_treeview"); + model = gtk_tree_view_get_model (treeview); + items = gtk_tree_model_iter_n_children (model, NULL) -1; + gtk_tree_view_get_cursor (treeview, &path, &column); + pindex = gtk_tree_path_get_indices (path); + if(!pindex) + return; + iindex = *pindex; + gtk_tree_path_free(path); + + if (event->state & GDK_SHIFT_MASK) + iindex = iindex == 0 ? items : iindex-1; + else + iindex = iindex == items ? 0 : iindex+1; + + path = gtk_tree_path_new_from_indices(iindex, -1); + column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 1); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, column, FALSE); + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, TAB_POINTER, &view, -1); + + if (midori_extension_get_boolean (thisExtension, "ShowTabInBackground")) { + midori_browser_set_current_tab (browser, view); + } else { + GtkImage *image; + GdkPixbuf *snapshot = tab_selector_get_snapshot(MIDORI_VIEW(view), + midori_extension_get_integer(thisExtension, "TabPreviewWidth"), + midori_extension_get_integer(thisExtension, "TabPreviewHeight")); + image = g_object_get_data(G_OBJECT(window), "tab_selector_image"); + gtk_image_set_from_pixbuf(image, snapshot); + } + gtk_tree_path_free(path); +} + +static gboolean tab_selector_handle_events (GtkWidget *widget, + GdkEventKey *event, + MidoriBrowser *browser) +{ + /* tab -> 23 + ctrl -> 37 */ + gint treeitems; + static GtkWidget *window; + if(event->type == GDK_KEY_PRESS && event->hardware_keycode == 23 && event->state & GDK_CONTROL_MASK) { + treeitems = gtk_notebook_get_n_pages (GTK_NOTEBOOK ( + katze_object_get_object(browser, "notebook"))); + if(treeitems > 1) { + if(!GTK_IS_WINDOW(window)) { + switchEvent = FALSE; + window = tab_selector_init_window(browser); + } + tab_selector_window_walk(window, event, browser); + } + return TRUE; + } else if(event->type == GDK_KEY_RELEASE && event->hardware_keycode == 37 && GTK_IS_WINDOW(window)) { + switchEvent = TRUE; + if(midori_extension_get_boolean(thisExtension, "ShowTabInBackground")) { + GtkWidget *page; + page = katze_object_get_object(browser, "tab"); + + GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + list = g_list_remove(list, page); + list = g_list_prepend(list, page); + g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); + } else { + GtkTreePath *path; + GtkTreeViewColumn *column; + GtkTreeIter iter; + GtkWidget *view, *treeview; + GtkTreeModel *model; + + treeview = g_object_get_data(G_OBJECT(window), "tab_selector_treeview"); + model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); + + gtk_tree_view_get_cursor ( + GTK_TREE_VIEW(treeview), &path, &column); + gtk_tree_model_get_iter ( + model, &iter, path); + gtk_tree_model_get ( + model, &iter, TAB_POINTER, &view, -1); + midori_browser_set_current_tab (browser, view); + gtk_tree_path_free (path); + } + gtk_widget_destroy(window); + window = NULL; + return TRUE; + } + return FALSE; +} + +static void tab_selector_switch_page (GtkNotebook *notebook, + GtkNotebookPage *page_, + guint page_num, + MidoriBrowser *browser) +{ + if(switchEvent) { + /* Don't know why *page_ points to the wrong address */ + GtkWidget *page; + page = katze_object_get_object(browser, "tab"); + + GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + list = g_list_remove(list, page); + list = g_list_prepend(list, page); + g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); + } +} + +static void +tab_selector_browser_add_tab_cb (MidoriBrowser *browser, + GtkWidget *view, + MidoriExtension *extension) +{ + g_signal_connect (view, "key_press_event", + G_CALLBACK (tab_selector_handle_events), browser); + g_signal_connect (view, "key_release_event", + G_CALLBACK (tab_selector_handle_events), browser); + + GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + list = g_list_append(list, view); + g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); +} + +static void +tab_selector_browser_remove_tab_cb (MidoriBrowser *browser, + GtkWidget *view, + MidoriExtension *extension) +{ + GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + list = g_list_remove(list, view); + g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); +} + +static void +tab_selector_disconnect_tab_cb (GtkWidget *view, + MidoriBrowser *browser) +{ + g_signal_handlers_disconnect_by_func ( + view, tab_selector_handle_events, browser); +} + +static void +tab_selector_app_add_browser_cb (MidoriApp *app, + MidoriBrowser *browser, + MidoriExtension *extension) +{ + GtkWidget *navigationbar, *notebook; + + g_object_set_data(G_OBJECT(browser), "tab_selector_list", NULL); + + g_signal_connect (browser, "add-tab", + G_CALLBACK (tab_selector_browser_add_tab_cb), extension); + g_signal_connect (browser, "remove-tab", + G_CALLBACK (tab_selector_browser_remove_tab_cb), extension); + + navigationbar = katze_object_get_object(browser, "navigationbar"); + g_signal_connect (navigationbar, "key_press_event", + G_CALLBACK (tab_selector_handle_events), browser); + g_signal_connect (navigationbar, "key_release_event", + G_CALLBACK (tab_selector_handle_events), browser); + g_object_unref(navigationbar); + + notebook = katze_object_get_object(browser, "notebook"); + g_signal_connect_after (notebook, "switch-page", + G_CALLBACK (tab_selector_switch_page), browser); + g_object_unref(notebook); +} + +static void +tab_selector_app_remove_browser_cb (MidoriApp *app, + MidoriBrowser *browser, + MidoriExtension *extension) +{ + GList *list = g_object_get_data (G_OBJECT (browser), "tab_selector_list"); + g_list_free (list); +} + +static void +tab_selector_disconnect_browser_cb (MidoriApp *app, + MidoriBrowser *browser, + MidoriExtension *extension) +{ + GtkWidget *navigationbar, *notebook; + + midori_browser_foreach (browser, + (GtkCallback)tab_selector_disconnect_tab_cb, browser); + + g_signal_handlers_disconnect_by_func ( + browser, tab_selector_browser_add_tab_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, tab_selector_browser_remove_tab_cb, extension); + g_signal_handlers_disconnect_by_func ( + katze_object_get_object (browser, "navigationbar"), + tab_selector_handle_events, browser); + + navigationbar = katze_object_get_object (browser, "navigationbar"); + g_signal_handlers_disconnect_by_func (navigationbar, + tab_selector_handle_events, browser); + g_signal_handlers_disconnect_by_func (navigationbar, + tab_selector_handle_events, browser); + g_object_unref (navigationbar); + + notebook = katze_object_get_object (browser, "notebook"); + g_signal_handlers_disconnect_by_func (notebook, + tab_selector_switch_page, browser); + g_object_unref (notebook); +} + +static void +tab_selector_activate_cb (MidoriExtension *extension, + MidoriApp *app) +{ + GtkWidget *view; + KatzeArray *browsers; + MidoriBrowser *browser; + guint i, j; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) { + j = 0; + tab_selector_app_add_browser_cb (app, browser, extension); + while((view = midori_browser_get_nth_tab(browser, j++))) + tab_selector_browser_add_tab_cb(browser, view, extension); + } + g_object_unref (browsers); + g_signal_connect (app, "add-browser", + G_CALLBACK (tab_selector_app_add_browser_cb), extension); + g_signal_connect (app, "remove-browser", + G_CALLBACK (tab_selector_app_remove_browser_cb), extension); +} + +static void +tab_selector_deactivate_cb (MidoriExtension *extension, + GtkWidget *foo) +{ + MidoriApp* app = midori_extension_get_app (extension); + KatzeArray *browsers; + MidoriBrowser *browser; + guint i; + + g_signal_handlers_disconnect_by_func ( + app, tab_selector_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + app, tab_selector_app_remove_browser_cb, extension); + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + tab_selector_disconnect_browser_cb (app, browser, extension); + g_object_unref (browsers); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension *extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Tab History List"), + "description", _("Allows to switch tabs by choosing from a " + "list sorted by last usage"), + "version", "0.1", + "authors", "André Stösel ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (tab_selector_activate_cb), NULL); + g_signal_connect (extension, "deactivate", + G_CALLBACK (tab_selector_deactivate_cb), NULL); + + midori_extension_install_boolean (extension, "ShowTabInBackground", FALSE); + midori_extension_install_integer (extension, "TitleColumnWidth", 300); + midori_extension_install_integer (extension, "TabPreviewWidth", 200); + midori_extension_install_integer (extension, "TabPreviewHeight", 200); + thisExtension = extension; + switchEvent = TRUE; + + return extension; +} + diff --git a/extensions/web-cache.c b/extensions/web-cache.c new file mode 100644 index 00000000..f669b8e6 --- /dev/null +++ b/extensions/web-cache.c @@ -0,0 +1,605 @@ +/* + Copyright (C) 2009 Christian Dywan + Copyright (C) 2009 Alexander Butenko + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +#include +#include "config.h" + +#include +#include +#if HAVE_UNISTD_H + #include +#endif + +static gboolean offline_mode = FALSE; +#define HAVE_WEBKIT_RESOURCE_REQUEST WEBKIT_CHECK_VERSION (1, 1, 14) +#define MAXLENGTH 1024 * 1024 + +static gchar* +web_cache_get_cached_path (MidoriExtension* extension, + const gchar* uri) +{ + static const gchar* cache_path = NULL; + gchar* checksum; + gchar* folder; + gchar* sub_path; + gchar* encoded; + gchar* ext; + gchar* cached_filename; + gchar* cached_path; + + if (!cache_path) + cache_path = midori_extension_get_string (extension, "path"); + checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + folder = g_strdup_printf ("%c%c", checksum[0], checksum[1]); + sub_path = g_build_path (G_DIR_SEPARATOR_S, cache_path, folder, NULL); + g_mkdir (sub_path, 0700); + g_free (folder); + + encoded = soup_uri_encode (uri, "/"); + ext = g_strdup (g_strrstr (encoded, ".")); + /* Make sure ext isn't becoming too long */ + if (ext && ext[0] && ext[1] && ext[2] && ext[3] && ext[4]) + ext[4] = '\0'; + cached_filename = g_strdup_printf ("%s%s", checksum, ext ? ext : ""); + g_free (ext); + g_free (encoded); + g_free (checksum); + cached_path = g_build_filename (sub_path, cached_filename, NULL); + g_free (cached_filename); + return cached_path; +} + +static gboolean +web_cache_replace_frame_uri (MidoriExtension* extension, + const gchar* uri, + WebKitWebFrame* web_frame) +{ + gchar* filename; + gboolean handled = FALSE; + + filename = web_cache_get_cached_path (extension, uri); + + /* g_debug ("cache lookup: %s => %s", uri, filename); */ + + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + gchar* data; + g_file_get_contents (filename, &data, NULL, NULL); + webkit_web_frame_load_alternate_string (web_frame, data, NULL, uri); + g_free (data); + handled = TRUE; + } + + g_free (filename); + return handled; +} + +static gboolean +web_cache_navigation_decision_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request, + WebKitWebNavigationAction* action, + WebKitWebPolicyDecision* decision, + MidoriExtension* extension) +{ + const gchar* uri = webkit_network_request_get_uri (request); + if (!(uri && g_str_has_prefix (uri, "http://"))) + return FALSE; + if (offline_mode == FALSE) + return FALSE; + + return web_cache_replace_frame_uri (extension, uri, web_frame); +} + +#if WEBKIT_CHECK_VERSION (1, 1, 6) +static gboolean +web_cache_load_error_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + const gchar* uri, + GError* error, + MidoriExtension* extension) +{ + if (offline_mode == FALSE) + return FALSE; + if (!(uri && g_str_has_prefix (uri, "http://"))) + return FALSE; + + return web_cache_replace_frame_uri (extension, uri, web_frame); +} +#endif + +static void +web_cache_save_headers (SoupMessage* msg, + gchar* filename) +{ + gchar* dsc_filename = g_strdup_printf ("%s.dsc.tmp", filename); + SoupMessageHeaders* hdrs = msg->response_headers; + SoupMessageHeadersIter iter; + const gchar* name, *value; + FILE* dscfd; + + soup_message_headers_iter_init (&iter, hdrs); + dscfd = g_fopen (dsc_filename, "w"); + while (soup_message_headers_iter_next (&iter, &name, &value)) + g_fprintf (dscfd, "%s: %s\n", name, value); + fclose (dscfd); + + g_free (dsc_filename); +} + +GHashTable* +web_cache_get_headers (gchar* filename) +{ + GHashTable* headers; + FILE* file; + gchar* dsc_filename; + + headers = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_free); + + if (!filename) + return headers; + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + return headers; + + dsc_filename = g_strdup_printf ("%s.dsc", filename); + if (!g_file_test (dsc_filename, G_FILE_TEST_EXISTS)) + { + g_free (dsc_filename); + return headers; + } + if ((file = g_fopen (dsc_filename, "r"))) + { + gchar line[128]; + while (fgets (line, 128, file)) + { + if (line==NULL) + continue; + g_strchomp (line); + gchar** data; + data = g_strsplit (line, ":", 2); + if (data[0] && data[1]) + g_hash_table_insert (headers, g_strdup (data[0]), + g_strdup (g_strchug (data[1]))); + g_strfreev (data); + } + } + fclose (file); + /* g_hash_table_destroy (headers); */ + g_free (dsc_filename); + return headers; +} + +static gboolean +web_cache_tmp_prepare (gchar* filename) +{ + gchar* tmp_filename = g_strdup_printf ("%s.tmp", filename); + + /* FIXME: If load was interruped we are ending up with a partical + cache files forever */ + if (g_file_test (tmp_filename, G_FILE_TEST_EXISTS)) + { + g_free (tmp_filename); + return FALSE; + } + g_file_set_contents (tmp_filename, "", -1, NULL); + g_free (tmp_filename); + return TRUE; +} + +static void +web_cache_set_content_type (SoupMessage* msg, + SoupBuffer* buffer) +{ + #if WEBKIT_CHECK_VERSION (1, 1, 15) + const char *ct; + SoupContentSniffer* sniffer = soup_content_sniffer_new (); + ct = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL); + if (!ct) + ct = soup_message_headers_get_one (msg->response_headers, "Content-Type"); + if (ct) + g_signal_emit_by_name (msg, "content-sniffed", ct, NULL); + #endif +} + +static void +web_cache_message_finished_cb (SoupMessage* msg, + gchar* filename) +{ + gchar* headers; + gchar* tmp_headers; + gchar* tmp_data; + + headers = g_strdup_printf ("%s.dsc", filename); + tmp_headers = g_strdup_printf ("%s.dsc.tmp", filename); + tmp_data = g_strdup_printf ("%s.tmp", filename); + + if (msg->status_code == SOUP_STATUS_OK) + { + g_rename (tmp_data, filename); + g_rename (tmp_headers, headers); + } + else + { + g_unlink (tmp_data); + g_unlink (tmp_headers); + } + + g_free (headers); + g_free (tmp_headers); + g_free (tmp_data); +} + +static void +web_cache_message_got_chunk_cb (SoupMessage* msg, + SoupBuffer* chunk, + gchar* filename) +{ + GFile *file; + GOutputStream *stream; + gchar *tmp_filename; + + if (!chunk->data || !chunk->length) + return; + + tmp_filename = g_strdup_printf ("%s.tmp", filename); + file = g_file_new_for_path (tmp_filename); + if ((stream = (GOutputStream*)g_file_append_to (file, 0, NULL, NULL))) + { + g_output_stream_write (stream, chunk->data, chunk->length, NULL, NULL); + g_object_unref (stream); + } + g_object_unref (file); + g_free (tmp_filename); +} + +static void +web_cache_message_rewrite (SoupMessage* msg, + gchar* filename) +{ + GHashTable* cache_headers = web_cache_get_headers (filename); + GHashTableIter iter; + SoupBuffer *buffer; + gpointer key, value; + char *data; + gsize length; + + soup_message_set_status (msg, SOUP_STATUS_OK); + g_hash_table_iter_init (&iter, cache_headers); + while (g_hash_table_iter_next (&iter, &key, &value)) + soup_message_headers_replace (msg->response_headers, key, value); + g_signal_emit_by_name (msg, "got-headers", NULL); + + msg->response_body = soup_message_body_new (); + g_file_get_contents (filename, &data, &length, NULL); + if (data && length) + { + buffer = soup_buffer_new (SOUP_MEMORY_TEMPORARY, data, length); + web_cache_set_content_type (msg, buffer); + soup_message_body_append_buffer (msg->response_body, buffer); + g_signal_emit_by_name (msg, "got-chunk", buffer, NULL); + soup_buffer_free (buffer); + } + soup_message_got_body (msg); + g_free (data); + + #if 0 + if (offline_mode == TRUE) + { + /* Workaroung for offline mode + FIXME: libsoup-CRITICAL **: queue_message: assertion `item != NULL' failed */ + SoupSession *session = webkit_get_default_session (); + soup_session_requeue_message (session, msg); + } + soup_message_finished (msg); + #endif +} + +static void +web_cache_mesage_got_headers_cb (SoupMessage* msg, + MidoriExtension* extension) +{ + SoupURI* soup_uri = soup_message_get_uri (msg); + gchar* uri; + gchar* filename; + const gchar* nocache; + SoupMessageHeaders *hdrs = msg->response_headers; + + /* Skip files downloaded by the user */ + if (g_object_get_data (G_OBJECT (msg), "midori-web-cache-download")) + return; + + /* Skip big files */ + const char* cl = soup_message_headers_get_one (hdrs, "Content-Length"); + if (cl && atoi (cl) > MAXLENGTH) + return; + + nocache = soup_message_headers_get_one (hdrs, "Pragma"); + if (!nocache) + nocache = soup_message_headers_get_one (hdrs, "Cache-Control"); + if (nocache && g_regex_match_simple ("no-cache|no-store", nocache, + G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) + { + return; + } + + uri = soup_uri ? soup_uri_to_string (soup_uri, FALSE) : g_strdup (""); + filename = web_cache_get_cached_path (extension, uri); + if (msg->status_code == SOUP_STATUS_NOT_MODIFIED) + { + /* g_debug ("loading from cache: %s -> %s", uri, filename); */ + g_signal_handlers_disconnect_by_func (msg, + web_cache_mesage_got_headers_cb, extension); + web_cache_message_rewrite (msg, filename); + g_free (filename); + } + else if (msg->status_code == SOUP_STATUS_OK) + { + /* g_debug ("updating cache: %s -> %s", uri, filename); */ + if (!web_cache_tmp_prepare (filename)) + return; + web_cache_save_headers (msg, filename); + g_signal_connect_data (msg, "got-chunk", + G_CALLBACK (web_cache_message_got_chunk_cb), + filename, (GClosureNotify)g_free, 0); + g_signal_connect (msg, "finished", + G_CALLBACK (web_cache_message_finished_cb), filename); + } + g_free (uri); +} + +#if HAVE_WEBKIT_RESOURCE_REQUEST +static void +web_cache_resource_request_starting_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitWebResource* web_resource, + WebKitNetworkRequest* request, + WebKitNetworkResponse* response, + MidoriExtension* extension) +{ + const gchar* uri; + gchar* filename; + /* TODO: Good place to check are we offline */ + uri = webkit_network_request_get_uri (request); + if (!(uri && g_str_has_prefix (uri, "http://"))) + return; + + if (offline_mode == FALSE) + return; + + filename = web_cache_get_cached_path (extension, uri); + /* g_debug ("loading %s -> %s",uri, filename); */ + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + { + g_free (filename); + return; + } + + if (!(g_strcmp0 (uri, webkit_web_frame_get_uri (web_frame)) + && g_strcmp0 (webkit_web_data_source_get_unreachable_uri ( + webkit_web_frame_get_data_source (web_frame)), uri))) + { + web_cache_replace_frame_uri (extension, uri, web_frame); + g_free (filename); + return; + } + + gchar* file_uri = g_filename_to_uri (filename, NULL, NULL); + webkit_network_request_set_uri (request, file_uri); + + g_free (file_uri); + g_free (filename); +} +#endif + +static void +web_cache_session_request_queued_cb (SoupSession* session, + SoupMessage* msg, + MidoriExtension* extension) +{ + /*FIXME: Should we need to free soupuri? */ + SoupURI* soup_uri = soup_message_get_uri (msg); + gchar* uri = soup_uri ? soup_uri_to_string (soup_uri, FALSE) : g_strdup (""); + + /* For now we are handling only online mode here */ + if (offline_mode == TRUE) + return; + + if (g_str_has_prefix (uri, "http") && !g_strcmp0 (msg->method, "GET")) + { + gchar* filename = web_cache_get_cached_path (extension, uri); + if (offline_mode == FALSE) + { + GHashTable* cache_headers; + gchar* etag; + gchar* last_modified; + + cache_headers = web_cache_get_headers (filename); + etag = g_hash_table_lookup (cache_headers, "ETag"); + last_modified = g_hash_table_lookup (cache_headers, "Last-Modified"); + if (etag) + soup_message_headers_replace (msg->request_headers, + "If-None-Match", etag); + if (last_modified) + soup_message_headers_replace (msg->request_headers, + "If-Modified-Since", last_modified); + g_signal_connect (msg, "got-headers", + G_CALLBACK (web_cache_mesage_got_headers_cb), extension); + + g_free (etag); + g_free (last_modified); + g_free (filename); + /* FIXME: uncoment this is leading to a crash + g_hash_table_destroy (cache_headers); */ + return; + } +/* + else + { + g_debug("queued in offline mode: %s -> %s", uri, filename); + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + soup_message_set_status (msg, SOUP_STATUS_NOT_MODIFIED); + web_cache_message_rewrite (msg, filename); + } + } +*/ + g_free (filename); + } + g_free (uri); +} + +static void +web_cache_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) +{ + GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); + g_signal_connect (web_view, "navigation-policy-decision-requested", + G_CALLBACK (web_cache_navigation_decision_cb), extension); + + #if WEBKIT_CHECK_VERSION (1, 1, 6) + g_signal_connect (web_view, "load-error", + G_CALLBACK (web_cache_load_error_cb), extension); + #endif + + #if HAVE_WEBKIT_RESOURCE_REQUEST + g_signal_connect (web_view, "resource-request-starting", + G_CALLBACK (web_cache_resource_request_starting_cb), extension); + #endif +} + +#if WEBKIT_CHECK_VERSION (1, 1, 3) +static void +web_cache_add_download_cb (MidoriBrowser* browser, + WebKitDownload* download, + MidoriExtension* extension) +{ + WebKitNetworkRequest* request = webkit_download_get_network_request (download); + SoupMessage* msg = webkit_network_request_get_message (request); + if (msg) + g_object_set_data (G_OBJECT (msg), "midori-web-cache-download", + (gpointer)0xdeadbeef); +} +#endif + +static void +web_cache_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser); + +static void +web_cache_add_tab_foreach_cb (MidoriView* view, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + web_cache_add_tab_cb (browser, view, extension); +} + +static void +web_cache_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + midori_browser_foreach (browser, + (GtkCallback)web_cache_add_tab_foreach_cb, extension); + g_signal_connect (browser, "add-tab", + G_CALLBACK (web_cache_add_tab_cb), extension); + #if WEBKIT_CHECK_VERSION (1, 1, 3) + g_signal_connect (browser, "add-download", + G_CALLBACK (web_cache_add_download_cb), extension); + #endif + g_signal_connect (extension, "deactivate", + G_CALLBACK (web_cache_deactivate_cb), browser); +} + +static void +web_cache_deactivate_tabs (MidoriView* view, + MidoriExtension* extension) +{ + #if HAVE_WEBKIT_RESOURCE_REQUEST + GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); + + g_signal_handlers_disconnect_by_func ( + web_view, web_cache_resource_request_starting_cb, extension); + #endif +} + +static void +web_cache_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + SoupSession* session = webkit_get_default_session (); + + g_signal_handlers_disconnect_by_func ( + session, web_cache_session_request_queued_cb, extension); + g_signal_handlers_disconnect_by_func ( + extension, web_cache_deactivate_cb, browser); + g_signal_handlers_disconnect_by_func ( + app, web_cache_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, web_cache_add_tab_cb, extension); + #if WEBKIT_CHECK_VERSION (1, 1, 3) + g_signal_handlers_disconnect_by_func ( + browser, web_cache_add_download_cb, extension); + #endif + midori_browser_foreach (browser, (GtkCallback)web_cache_deactivate_tabs, extension); +} + +static void +web_cache_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + const gchar* cache_path = midori_extension_get_string (extension, "path"); + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + SoupSession* session = webkit_get_default_session (); + + katze_mkdir_with_parents (cache_path, 0700); + g_signal_connect (session, "request-queued", + G_CALLBACK (web_cache_session_request_queued_cb), extension); + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + web_cache_app_add_browser_cb (app, browser, extension); + g_signal_connect (app, "add-browser", + G_CALLBACK (web_cache_app_add_browser_cb), extension); + + g_object_unref (browsers); +} + +MidoriExtension* +extension_init (void) +{ + gchar* cache_path = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL); + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Web Cache"), + "description", _("Cache HTTP communication on disk"), + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + midori_extension_install_string (extension, "path", cache_path); + midori_extension_install_integer (extension, "size", 50); + + g_free (cache_path); + + g_signal_connect (extension, "activate", + G_CALLBACK (web_cache_activate_cb), NULL); + + return extension; +} diff --git a/icons/wscript_build b/icons/wscript_build index 04053068..caaa19b9 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -15,7 +15,9 @@ def add_image (bld, category, name): if rsvg_convert: Utils.check_dir (blddir + '/icons') - for size in [16, 22, 24, 32, 48]: + icon_sizes = [16, 22, 24, 32, 48] + + for size in icon_sizes: format = str (size) + 'x' + str (size) if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category, diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 1fb6b925..4186d609 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -20,12 +20,17 @@ #include #include +#if HAVE_CONFIG_H + #include "config.h" +#endif + struct _KatzeArrayAction { GtkAction parent_instance; KatzeArray* array; KatzeNet* net; + gboolean reversed; }; struct _KatzeArrayActionClass @@ -39,7 +44,8 @@ enum { PROP_0, - PROP_ARRAY + PROP_ARRAY, + PROP_REVERSED }; enum @@ -154,6 +160,22 @@ katze_array_action_class_init (KatzeArrayActionClass* class) "The array the action represents", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); + + /** + * KatzeArrayAction:reversed: + * + * Whether the array should be walked backwards when building menus. + * + * Since: 0.2.2 + **/ + g_object_class_install_property (gobject_class, + PROP_REVERSED, + g_param_spec_boolean ( + "reversed", + "Reversed", + "Whether the array should be walked backwards when building menus", + FALSE, + G_PARAM_READWRITE)); } static void @@ -161,6 +183,7 @@ katze_array_action_init (KatzeArrayAction* array_action) { array_action->array = NULL; array_action->net = katze_net_new (); + array_action->reversed = FALSE; } static void @@ -187,6 +210,9 @@ katze_array_action_set_property (GObject* object, case PROP_ARRAY: katze_array_action_set_array (array_action, g_value_get_object (value)); break; + case PROP_REVERSED: + array_action->reversed = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -206,6 +232,9 @@ katze_array_action_get_property (GObject* object, case PROP_ARRAY: g_value_set_object (value, array_action->array); break; + case PROP_REVERSED: + g_value_set_boolean (value, array_action->reversed); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -272,7 +301,8 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GtkWidget* menu, GtkWidget* proxy) { - guint i; + gint i; + gint summand; KatzeItem* item; GtkWidget* menuitem; const gchar* icon_name; @@ -280,8 +310,17 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GtkWidget* image; GtkWidget* submenu; - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) + if (array_action->reversed) + { + i = katze_array_get_length (array); + summand = -1; + } + else + { + i = -1; + summand = +1; + } + while ((item = katze_array_get_nth_item (array, i += summand))) { /* FIXME: The menu item should reflect changes to the item */ if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) @@ -301,8 +340,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), NULL, proxy, NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); } @@ -322,19 +360,12 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, } else { - g_signal_connect (menuitem, "button-press-event", - G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); /* we need the 'activate' signal as well for keyboard events */ g_signal_connect (menuitem, "activate", G_CALLBACK (katze_array_action_menu_activate_cb), array_action); } - gtk_widget_show (menuitem); - } - if (!i) - { - menuitem = gtk_image_menu_item_new_with_label (_("Empty")); - gtk_widget_set_sensitive (menuitem, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "button-press-event", + G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); gtk_widget_show (menuitem); } } @@ -370,9 +401,15 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, return; } + array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray"); + if (KATZE_IS_ITEM (array) && katze_item_get_uri ((KatzeItem*)array)) + { + g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, array); + return; + } + menu = gtk_menu_new (); - array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray"); if (!array) array = array_action->array; katze_array_action_generate_menu (array_action, array, menu, proxy); @@ -381,8 +418,14 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, if (array == array_action->array) g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); + #if HAVE_HILDON + /* Avoid a bug in GTK+ messing up the initial scrolling position */ + katze_widget_popup (NULL, GTK_MENU (menu), + NULL, KATZE_MENU_POSITION_LEFT); + #else katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT); + #endif } static GtkWidget* @@ -399,7 +442,7 @@ katze_array_action_create_tool_item (GtkAction* action) { GtkWidget* toolitem; - toolitem = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + toolitem = GTK_WIDGET (gtk_tool_button_new (NULL, "")); return toolitem; } @@ -460,8 +503,7 @@ katze_array_action_item_notify_cb (KatzeItem* item, } else if (!KATZE_IS_ARRAY (item) && !strcmp (property, "uri")) { - icon = katze_net_load_icon (array_action->net, katze_item_get_uri (item), - NULL, GTK_WIDGET (toolitem), NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), GTK_WIDGET (toolitem)); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); @@ -497,8 +539,7 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), NULL, proxy, NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); } @@ -508,16 +549,34 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, GTK_IMAGE_MENU_ITEM (menuitem), TRUE); #endif g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - g_signal_connect (menuitem, "button-press-event", - G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); - /* we need the 'activate' signal as well for keyboard events */ - g_signal_connect (menuitem, "activate", - G_CALLBACK (katze_array_action_menu_activate_cb), array_action); + if (KATZE_IS_ARRAY (item)) + { + GtkWidget* submenu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); + g_signal_connect (menuitem, "select", + G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); + } + else + { + g_signal_connect (menuitem, "button-press-event", + G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); + /* we need the 'activate' signal as well for keyboard events */ + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_activate_cb), array_action); + } gtk_tool_item_set_proxy_menu_item (GTK_TOOL_ITEM (proxy), "katze-tool-item-menu", menuitem); return TRUE; } +static void +katze_array_action_toolitem_destroy_cb (GtkToolItem* toolitem, + KatzeItem* item) +{ + g_signal_handlers_disconnect_by_func (item, + G_CALLBACK (katze_array_action_item_notify_cb), toolitem); +} + /** * katze_array_action_create_tool_item_for: * @array_action: a #KatzeArrayAction @@ -552,15 +611,14 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, if (!KATZE_IS_ARRAY (item) && !uri) return gtk_separator_tool_item_new (); - toolitem = gtk_tool_button_new (NULL, NULL); + toolitem = gtk_tool_button_new (NULL, ""); g_signal_connect (toolitem, "create-menu-proxy", G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); if (KATZE_IS_ARRAY (item)) icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, uri, - NULL, GTK_WIDGET (toolitem), NULL); + icon = katze_load_cached_icon (uri, GTK_WIDGET (toolitem)); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); @@ -585,16 +643,16 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, gtk_tool_item_set_tooltip_text (toolitem, desc); else gtk_tool_item_set_tooltip_text (toolitem, uri); - if (KATZE_IS_ARRAY (item)) - { - g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action); - } + + g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action); g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action); g_signal_connect (item, "notify", G_CALLBACK (katze_array_action_item_notify_cb), toolitem); + g_signal_connect (toolitem, "destroy", + G_CALLBACK (katze_array_action_toolitem_destroy_cb), item); return toolitem; } diff --git a/katze/katze-item.c b/katze/katze-item.c index a63afd45..e3962a39 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -75,12 +75,14 @@ katze_item_class_init (KatzeItemClass* class) * * Emitted when a meta data value was changed. * + * Since 0.2.2 details according to keys are supported. + * * Since: 0.1.9 */ signals[META_DATA_CHANGED] = g_signal_new ( "meta-data-changed", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), + (GSignalFlags)(G_SIGNAL_RUN_LAST |G_SIGNAL_DETAILED), 0, 0, NULL, @@ -510,7 +512,7 @@ katze_item_set_meta_data_value (KatzeItem* item, g_hash_table_insert (item->metadata, g_strdup (&key[7]), value); else g_hash_table_insert (item->metadata, g_strdup (key), value); - g_signal_emit (item, signals[META_DATA_CHANGED], 0, key); + g_signal_emit (item, signals[META_DATA_CHANGED], g_quark_from_string (key), key); } /** @@ -590,7 +592,7 @@ katze_item_get_meta_integer (KatzeItem* item, if (g_str_has_prefix (key, "midori:")) key = &key[7]; if (g_hash_table_lookup_extended (item->metadata, key, NULL, &value)) - return g_ascii_strtoll (value, NULL, 0); + return value ? g_ascii_strtoll (value, NULL, 0) : -1; return -1; } diff --git a/katze/katze-net.c b/katze/katze-net.c index e445aa8d..83ef0519 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -157,7 +157,7 @@ katze_net_get_cached_path (KatzeNet* net, cache_path = g_build_filename (net->cache_path, subfolder, NULL); else cache_path = net->cache_path; - g_mkdir_with_parents (cache_path, 0700); + katze_mkdir_with_parents (cache_path, 0700); checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); extension = g_strrstr (uri, "."); diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c new file mode 100644 index 00000000..91006cb9 --- /dev/null +++ b/katze/katze-preferences.c @@ -0,0 +1,421 @@ +/* + Copyright (C) 2007-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-preferences.h" + +#if HAVE_CONFIG_H + #include +#endif + +#if HAVE_HILDON + #include "katze-scrolled.h" + #include +#endif + +#include +#include + +struct _KatzePreferencesPrivate +{ + #if HAVE_HILDON + GtkWidget* scrolled; + GtkSizeGroup* sizegroup; + GtkSizeGroup* sizegroup2; + GtkWidget* box; + GtkWidget* hbox; + #else + GtkWidget* notebook; + GtkWidget* toolbar; + GtkWidget* toolbutton; + GtkSizeGroup* sizegroup; + GtkSizeGroup* sizegroup2; + GtkWidget* page; + GtkWidget* frame; + GtkWidget* box; + GtkWidget* hbox; + #endif +}; + +G_DEFINE_TYPE (KatzePreferences, katze_preferences, GTK_TYPE_DIALOG); + +static void +katze_preferences_finalize (GObject* object); + +static void +katze_preferences_class_init (KatzePreferencesClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_preferences_finalize; + + g_type_class_add_private (class, sizeof (KatzePreferencesPrivate)); +} + +static void +katze_preferences_response_cb (KatzePreferences* preferences, + gint response) +{ + if (response == GTK_RESPONSE_CLOSE || response == GTK_RESPONSE_APPLY) + gtk_widget_destroy (GTK_WIDGET (preferences)); +} + +#ifdef HAVE_HILDON_2_2 +static void +katze_preferences_size_request_cb (KatzePreferences* preferences, + GtkRequisition* requisition) +{ + GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (preferences)); + if (gdk_screen_get_height (screen) > gdk_screen_get_width (screen)) + gtk_widget_hide (gtk_dialog_get_action_area (GTK_DIALOG (preferences))); + else + gtk_widget_show (gtk_dialog_get_action_area (GTK_DIALOG (preferences))); +} +#endif + +static void +katze_preferences_init (KatzePreferences* preferences) +{ + KatzePreferencesPrivate* priv; + gchar* dialog_title; + + preferences->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE ((preferences), + KATZE_TYPE_PREFERENCES, KatzePreferencesPrivate); + + dialog_title = g_strdup_printf (_("Preferences for %s"), + g_get_application_name ()); + g_object_set (preferences, + "icon-name", GTK_STOCK_PREFERENCES, + "title", dialog_title, + "has-separator", FALSE, + NULL); + g_free (dialog_title); + + #if !HAVE_OSX + gtk_dialog_add_buttons (GTK_DIALOG (preferences), + GTK_STOCK_HELP, GTK_RESPONSE_HELP, + #if HAVE_HILDON + GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, + #else + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + #endif + NULL); + #endif + + g_object_connect (preferences, + "signal::response", katze_preferences_response_cb, NULL, + NULL); + + #ifdef HAVE_HILDON_2_2 + katze_preferences_size_request_cb (preferences, NULL); + g_object_connect (preferences, + "signal::size-request", katze_preferences_size_request_cb, NULL, + NULL); + #endif +} + +static void +katze_preferences_finalize (GObject* object) +{ + G_OBJECT_CLASS (katze_preferences_parent_class)->finalize (object); +} + +/** + * katze_preferences_new: + * @parent: the parent window, or %NULL + * + * Creates a new preferences dialog. + * + * Return value: a new #KatzePreferences + * + * Since: 0.2.1 + **/ +GtkWidget* +katze_preferences_new (GtkWindow* parent) +{ + KatzePreferences* preferences; + + g_return_val_if_fail (!parent || GTK_IS_WINDOW (parent), NULL); + + preferences = g_object_new (KATZE_TYPE_PREFERENCES, + "transient-for", parent, + NULL); + + return GTK_WIDGET (preferences); +} + +#if HAVE_OSX +static void +katze_preferences_help_clicked_cb (GtkWidget* button, + GtkDialog* dialog) +{ + gtk_dialog_response (dialog, GTK_RESPONSE_HELP); +} + +static void +katze_preferences_toolbutton_clicked_cb (GtkWidget* toolbutton, + GtkWidget* page) +{ + gpointer notebook = g_object_get_data (G_OBJECT (toolbutton), "notebook"); + guint n = gtk_notebook_page_num (notebook, page); + gtk_notebook_set_current_page (notebook, n); +} +#endif + +static void +katze_preferences_prepare (KatzePreferences* preferences) +{ + KatzePreferencesPrivate* priv = preferences->priv; + + #if HAVE_HILDON + GtkWidget* viewport; + + priv->scrolled = katze_scrolled_new (NULL, NULL); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->vbox), + priv->scrolled, TRUE, TRUE, 4); + viewport = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); + gtk_container_add (GTK_CONTAINER (priv->scrolled), viewport); + priv->box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (viewport), priv->box); + + priv->hbox = NULL; + priv->sizegroup = NULL; + priv->sizegroup2 = NULL; + + g_signal_connect (priv->scrolled, "destroy", + G_CALLBACK (gtk_widget_destroyed), &priv->scrolled); + #else + priv->notebook = gtk_notebook_new (); + gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6); + + #if HAVE_OSX + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); + priv->toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (priv->toolbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (priv->toolbar), FALSE); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), + priv->toolbar, FALSE, FALSE, 0); + #else + priv->toolbar = NULL; + #endif + priv->toolbutton = NULL; + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->vbox), + priv->notebook, FALSE, FALSE, 4); + + priv->sizegroup = NULL; + priv->sizegroup2 = NULL; + priv->page = NULL; + priv->frame = NULL; + priv->box = NULL; + priv->hbox = NULL; + + g_signal_connect (priv->notebook, "destroy", + G_CALLBACK (gtk_widget_destroyed), &priv->notebook); + #endif + + #if HAVE_OSX + GtkWidget* icon; + GtkWidget* hbox = gtk_hbox_new (FALSE, 0); + GtkWidget* button = gtk_button_new (); + icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), icon); + g_signal_connect (button, "clicked", + G_CALLBACK (katze_preferences_help_clicked_cb), preferences); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->action_area), + hbox, FALSE, FALSE, 0); + #endif + gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); +} + +/** + * katze_preferences_add_category: + * @preferences: a #KatzePreferences instance + * @label: a category label + * @icon: an icon name + * + * Adds a new category with the specified label to the dialog. + * + * Since: 0.2.1 + **/ +void +katze_preferences_add_category (KatzePreferences* preferences, + const gchar* label, + const gchar* icon) +{ + KatzePreferencesPrivate* priv = preferences->priv; + + #if HAVE_HILDON + GtkWidget* widget; + gchar* markup; + + if (!priv->scrolled) + katze_preferences_prepare (preferences); + + widget = gtk_label_new (NULL); + gtk_widget_show (widget); + markup = g_markup_printf_escaped ("%s", label); + gtk_label_set_markup (GTK_LABEL (widget), markup); + g_free (markup); + gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE, 0); + + priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + priv->sizegroup2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + priv->hbox = NULL; + #else + if (!priv->notebook) + katze_preferences_prepare (preferences); + + priv->page = gtk_vbox_new (FALSE, 0); + priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_widget_show (priv->page); + gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4); + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), + priv->page, gtk_label_new (label)); + #if HAVE_OSX + priv->toolbutton = GTK_WIDGET (priv->toolbutton ? + gtk_radio_tool_button_new_from_widget ( + GTK_RADIO_TOOL_BUTTON (priv->toolbutton)) + : gtk_radio_tool_button_new (NULL)); + gtk_widget_show (priv->toolbutton); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->toolbutton), label); + gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (priv->toolbutton), icon); + gtk_toolbar_insert (GTK_TOOLBAR (priv->toolbar), + GTK_TOOL_ITEM (priv->toolbutton), -1); + g_signal_connect (priv->toolbutton, "clicked", + G_CALLBACK (katze_preferences_toolbutton_clicked_cb), priv->page); + if (priv->toolbutton) + g_object_set_data (G_OBJECT (priv->toolbutton), "notebook", priv->notebook); + #endif + #endif +} + +#if !HAVE_HILDON +static GtkWidget* +katze_hig_frame_new (const gchar* title) +{ + /* Create a frame with no actual frame but a bold label and indentation */ + GtkWidget* frame = gtk_frame_new (NULL); + #ifdef G_OS_WIN32 + gtk_frame_set_label (GTK_FRAME (frame), title); + #else + gchar* title_bold = g_strdup_printf ("%s", title); + GtkWidget* label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), title_bold); + g_free (title_bold); + gtk_frame_set_label_widget (GTK_FRAME (frame), label); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + #endif + return frame; +} +#endif + +/** + * katze_preferences_add_group: + * @preferences: a #KatzePreferences instance + * @label: a group label + * + * Adds a new group with the specified label to the dialog. + * + * Since: 0.2.1 + **/ +void +katze_preferences_add_group (KatzePreferences* preferences, + const gchar* label) +{ + #if !HAVE_HILDON + KatzePreferencesPrivate* priv = preferences->priv; + + priv->sizegroup2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + priv->frame = katze_hig_frame_new (label); + gtk_container_set_border_width (GTK_CONTAINER (priv->frame), 4); + gtk_box_pack_start (GTK_BOX (priv->page), priv->frame, FALSE, FALSE, 0); + priv->box = gtk_vbox_new (FALSE, 4); + gtk_container_set_border_width (GTK_CONTAINER (priv->box), 4); + gtk_container_add (GTK_CONTAINER (priv->frame), priv->box); + gtk_widget_show_all (priv->frame); + #endif +} + +/** + * katze_preferences_add_widget: + * @preferences: a #KatzePreferences instance + * @widget: a widget representing an option + * @type: "filled", "indented", or "spanned" + * + * Adds a widget to the dialog. + * + * Since: 0.2.1 + **/ +void +katze_preferences_add_widget (KatzePreferences* preferences, + GtkWidget* widget, + const gchar* type) +{ + KatzePreferencesPrivate* priv; + const gchar* _type; + + g_return_if_fail (KATZE_IS_PREFERENCES (preferences)); + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (type != NULL); + + priv = preferences->priv; + _type = g_intern_string (type); + + /* Showing implicitly widget and children is not the best idea, + but lots of repeated function calls aren't either. */ + gtk_widget_show_all (widget); + + if (!priv->hbox) + _type = g_intern_string ("indented"); + #ifdef HAVE_HILDON_2_2 + else if (HILDON_IS_CHECK_BUTTON (widget) || HILDON_IS_PICKER_BUTTON (widget)) + _type = g_intern_string ("indented"); + #endif + + if (_type != g_intern_static_string ("spanned")) + { + priv->hbox = gtk_hbox_new (FALSE, 4); + gtk_widget_show (priv->hbox); + gtk_box_pack_start (GTK_BOX (priv->hbox), widget, TRUE, FALSE, 0); + } + + if (_type == g_intern_static_string ("filled")) + gtk_box_pack_start (GTK_BOX (priv->box), priv->hbox, TRUE, FALSE, 0); + else if (_type == g_intern_static_string ("indented")) + { + GtkWidget* align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_widget_show (align); + gtk_container_add (GTK_CONTAINER (align), priv->hbox); + #if HAVE_HILDON + if (!GTK_IS_SPIN_BUTTON (widget) && !GTK_IS_LABEL (widget)) + #else + if (!GTK_IS_SPIN_BUTTON (widget)) + #endif + gtk_size_group_add_widget (priv->sizegroup, widget); + gtk_box_pack_start (GTK_BOX (priv->box), align, TRUE, FALSE, 0); + } + else if (_type == g_intern_static_string ("spanned")) + { + GtkWidget* align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_widget_show (align); + gtk_container_add (GTK_CONTAINER (align), widget); + if (!GTK_IS_LABEL (widget) && !GTK_IS_SPIN_BUTTON (widget) + && !(GTK_IS_BUTTON (widget) && !GTK_IS_TOGGLE_BUTTON (widget))) + gtk_size_group_add_widget (priv->sizegroup2, widget); + gtk_box_pack_start (GTK_BOX (priv->hbox), align, TRUE, FALSE, 0); + } + + #if HAVE_HILDON + if (GTK_IS_BUTTON (widget) && !GTK_WIDGET_IS_SENSITIVE (widget)) + gtk_widget_hide (widget); + #endif +} diff --git a/katze/katze-preferences.h b/katze/katze-preferences.h new file mode 100644 index 00000000..63bd4843 --- /dev/null +++ b/katze/katze-preferences.h @@ -0,0 +1,70 @@ +/* + Copyright (C) 2008-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_PREFERENCES_H__ +#define __KATZE_PREFERENCES_H__ + +#include "katze-utils.h" + +G_BEGIN_DECLS + +#define KATZE_TYPE_PREFERENCES \ + (katze_preferences_get_type ()) +#define KATZE_PREFERENCES(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_PREFERENCES, KatzePreferences)) +#define KATZE_PREFERENCES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_PREFERENCES, KatzePreferencesClass)) +#define KATZE_IS_PREFERENCES(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_PREFERENCES)) +#define KATZE_IS_PREFERENCES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_PREFERENCES)) +#define KATZE_PREFERENCES_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_PREFERENCES, KatzePreferencesClass)) + +typedef struct _KatzePreferences KatzePreferences; +typedef struct _KatzePreferencesClass KatzePreferencesClass; +typedef struct _KatzePreferencesPrivate KatzePreferencesPrivate; + +struct _KatzePreferences +{ + GtkDialog parent_instance; + + KatzePreferencesPrivate* priv; +}; + +struct _KatzePreferencesClass +{ + GtkDialogClass parent_class; +}; + +GType +katze_preferences_get_type (void); + +GtkWidget* +katze_preferences_new (GtkWindow* parent); + +void +katze_preferences_add_category (KatzePreferences* preferences, + const gchar* label, + const gchar* icon); + +void +katze_preferences_add_group (KatzePreferences* preferences, + const gchar* label); + +void +katze_preferences_add_widget (KatzePreferences* preferences, + GtkWidget* widget, + const gchar* type); + +G_END_DECLS + +#endif /* __KATZE_PREFERENCES_H__ */ diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c index 49239250..e059551e 100644 --- a/katze/katze-scrolled.c +++ b/katze/katze-scrolled.c @@ -16,6 +16,7 @@ #endif #include "katze-scrolled.h" +#include "katze-utils.h" #define DEFAULT_INTERVAL 50 #define DEFAULT_DECELERATION 0.7 @@ -819,14 +820,13 @@ katze_scrolled_realize (GtkWidget* widget) KatzeScrolled* scrolled = KATZE_SCROLLED (widget); KatzeScrolledPrivate* priv = scrolled->priv; gboolean drag_scrolling; - GtkSettings* settings = gtk_widget_get_settings (widget); GtkPolicyType policy; GdkWindowAttr attr; GdkColor color; (*GTK_WIDGET_CLASS (katze_scrolled_parent_class)->realize) (widget); - g_object_get (settings, "gtk-touchscreen-mode", &drag_scrolling, NULL); + drag_scrolling = katze_widget_has_touchscreen_mode (widget); policy = drag_scrolling ? GTK_POLICY_NEVER : GTK_POLICY_AUTOMATIC; g_object_set (scrolled, "drag-scrolling", drag_scrolling, "hscrollbar-policy", policy, "vscrollbar-policy", policy, NULL); @@ -888,7 +888,6 @@ katze_scrolled_class_init (KatzeScrolledClass* class) GtkWidgetClass* widget_class; GtkContainerClass* container_class; GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - GtkSettings* gtk_settings; gobject_class = G_OBJECT_CLASS (class); widget_class = GTK_WIDGET_CLASS (class); @@ -944,13 +943,8 @@ katze_scrolled_class_init (KatzeScrolledClass* class) /* Usually touchscreen mode is either always set or it isn't, so it should be a safe optimization to not setup events if not needed. */ - if ((gtk_settings = gtk_settings_get_default ())) - { - gboolean touchscreen; - g_object_get (gtk_settings, "gtk-touchscreen-mode", &touchscreen, NULL); - if (touchscreen) - katze_scrolled_event_handler_append (katze_scrolled_event_handler, NULL); - } + if (katze_widget_has_touchscreen_mode (NULL)) + katze_scrolled_event_handler_append (katze_scrolled_event_handler, NULL); g_type_class_add_private (class, sizeof (KatzeScrolledPrivate)); } diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 473d0913..f5566c81 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -11,15 +11,31 @@ #include "katze-utils.h" +#include #include +#include #include +#if HAVE_CONFIG_H + #include "config.h" +#endif + +#ifdef HAVE_HILDON_2_2 + #include +#endif + static void proxy_toggle_button_toggled_cb (GtkToggleButton* button, GObject* object) { - gboolean toggled = gtk_toggle_button_get_active (button); + gboolean toggled; + #ifdef HAVE_HILDON_2_2 + if (HILDON_IS_CHECK_BUTTON (button)) + toggled = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button)); + #else + toggled = gtk_toggle_button_get_active (button); + #endif const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, toggled, NULL); } @@ -60,6 +76,79 @@ proxy_combo_box_text_changed_cb (GtkComboBox* button, g_object_set (object, property, text, NULL); } +static const gchar* +katze_app_info_get_commandline (GAppInfo* info) +{ + const gchar* exe; + + #if GLIB_CHECK_VERSION (2, 20, 0) + exe = g_app_info_get_commandline (info); + #else + exe = g_object_get_data (G_OBJECT (info), "katze-cmdline"); + #endif + if (!exe) + exe = g_app_info_get_executable (info); + return exe; +} + +static gboolean +proxy_entry_focus_out_event_cb (GtkEntry* entry, + GdkEventFocus* event, + GObject* object); + +static void +proxy_combo_box_apps_changed_cb (GtkComboBox* button, + GObject* object) +{ + guint active = gtk_combo_box_get_active (button); + GtkTreeModel* model = gtk_combo_box_get_model (button); + GtkTreeIter iter; + + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, active)) + { + GAppInfo* info; + gboolean use_entry; + GtkWidget* child; + const gchar* exe; + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + + gtk_tree_model_get (model, &iter, 0, &info, -1); + + use_entry = info && !g_app_info_get_icon (info); + child = gtk_bin_get_child (GTK_BIN (button)); + if (use_entry && GTK_IS_CELL_VIEW (child)) + { + GtkWidget* entry = gtk_entry_new (); + exe = g_app_info_get_executable (info); + if (exe && *exe && strcmp (exe, "%f")) + gtk_entry_set_text (GTK_ENTRY (entry), exe); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (button), entry); + gtk_widget_grab_focus (entry); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + g_object_set_data_full (G_OBJECT (entry), "property", + g_strdup (property), g_free); + } + else if (!use_entry && GTK_IS_ENTRY (child)) + { + /* Force the combo to change the item again */ + gtk_widget_destroy (child); + gtk_combo_box_set_active (button, 0); + gtk_combo_box_set_active_iter (button, &iter); + } + + if (info) + { + exe = katze_app_info_get_commandline (info); + g_object_set (object, property, exe, NULL); + g_object_unref (info); + } + else + g_object_set (object, property, "", NULL); + } +} + static void proxy_entry_activate_cb (GtkEntry* entry, GObject* object) @@ -99,14 +188,73 @@ proxy_spin_button_changed_cb (GtkSpinButton* button, } } +#ifdef HAVE_HILDON_2_2 +static void +proxy_picker_button_changed_cb (HildonPickerButton* button, + GObject* object) +{ + gint value = hildon_picker_button_get_active (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, value, NULL); + /* FIXME: Implement custom-PROPERTY */ +} +#else static void proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) { gint value = gtk_combo_box_get_active (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + gint custom_value = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), + "katze-custom-value")); + const gchar* custom_property = g_object_get_data (G_OBJECT (button), + "katze-custom-property"); + + if (custom_value) + { + GtkWidget* child = gtk_bin_get_child (GTK_BIN (button)); + + if (value == custom_value && GTK_IS_CELL_VIEW (child)) + { + GtkWidget* entry = gtk_entry_new (); + gchar* custom_text = katze_object_get_string (object, custom_property); + if (custom_text && *custom_text) + gtk_entry_set_text (GTK_ENTRY (entry), custom_text); + g_free (custom_text); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (button), entry); + gtk_widget_grab_focus (entry); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + g_object_set_data_full (G_OBJECT (entry), "property", + g_strdup (custom_property), g_free); + } + else if (value != custom_value && GTK_IS_ENTRY (child)) + { + /* Force the combo to change the item again */ + gtk_widget_destroy (child); + gtk_combo_box_set_active (button, value + 1); + gtk_combo_box_set_active (button, value); + } + } + g_object_set (object, property, value, NULL); + + if (custom_value) + { + #if GTK_CHECK_VERSION (2, 12, 0) + if (value == custom_value) + gtk_widget_set_tooltip_text (GTK_WIDGET (button), NULL); + else + { + gchar* custom_text = katze_object_get_string (object, custom_property); + gtk_widget_set_tooltip_text (GTK_WIDGET (button), custom_text); + g_free (custom_text); + } + #endif + } } +#endif static void proxy_object_notify_boolean_cb (GObject* object, @@ -145,6 +293,127 @@ proxy_widget_string_destroy_cb (GtkWidget* proxy, proxy_object_notify_string_cb, proxy); } +static GList* +katze_app_info_get_all_for_category (const gchar* category) +{ + GList* all_apps = g_app_info_get_all (); + GList* apps = NULL; + guint i = 0; + GAppInfo* info; + while ((info = g_list_nth_data (all_apps, i++))) + { + #ifdef GDK_WINDOWING_X11 + gchar* filename = g_strconcat ("applications/", g_app_info_get_id (info), NULL); + GKeyFile* file = g_key_file_new (); + + if (g_key_file_load_from_data_dirs (file, filename, NULL, G_KEY_FILE_NONE, NULL)) + { + gchar* cat = g_key_file_get_string (file, "Desktop Entry", + "Categories", NULL); + if (cat && g_strrstr (cat, category)) + apps = g_list_append (apps, info); + + g_free (cat); + } + g_key_file_free (file); + g_free (filename); + #else + apps = g_list_append (apps, info); + #endif + } + g_list_free (all_apps); + return apps; +} + +#if !GLIB_CHECK_VERSION (2, 20, 0) +/* Icon tokenization, for Glib < 2.20 */ +static gboolean +g_icon_to_string_tokenized (GIcon *icon, + GString *s) +{ + GPtrArray *tokens; + guint i; + + if (G_IS_THEMED_ICON (icon)) + { + guint n; + const char * const *names; + tokens = g_ptr_array_new (); + g_object_get (icon, "names", &names, NULL); + for (n = 0; names[n] != NULL; n++) + g_ptr_array_add (tokens, g_strdup (names[n])); + } + else if (G_IS_FILE_ICON (icon)) + { + tokens = g_ptr_array_new (); + g_ptr_array_add (tokens, + g_file_get_uri (g_file_icon_get_file (G_FILE_ICON (icon)))); + } + else + return FALSE; + + g_string_append (s, g_type_name_from_instance ((GTypeInstance *)icon)); + + for (i = 0; i < tokens->len; i++) + { + char *token = g_ptr_array_index (tokens, i); + + g_string_append_c (s, ' '); + g_string_append_uri_escaped (s, token, "!$&'()*+,;=:@/", TRUE); + + g_free (token); + } + + g_ptr_array_free (tokens, TRUE); + + return TRUE; +} + +/* GIcon serialization, for Glib < 2.20 */ +static gchar * +g_icon_to_string (GIcon *icon) +{ + gchar *ret = NULL; + + g_return_val_if_fail (G_IS_ICON (icon), NULL); + + if (G_IS_FILE_ICON (icon)) + { + GFile *file = g_file_icon_get_file (G_FILE_ICON (icon)); + if (g_file_is_native (file)) + { + ret = g_file_get_path (file); + if (!g_utf8_validate (ret, -1, NULL)) + { + g_free (ret); + ret = NULL; + } + } + else + ret = g_file_get_uri (file); + } + else if (G_IS_THEMED_ICON (icon)) + { + const char * const *names; + g_object_get (icon, "names", &names, NULL); + if (names && names[0] && names[0][0] != '.' && + g_utf8_validate (names[0], -1, NULL) && names[1] == NULL) + ret = g_strdup (names[0]); + } + + if (ret == NULL) + { + GString *s = g_string_new (". "); + if (g_icon_to_string_tokenized (icon, s)) + ret = g_string_free (s, FALSE); + else + g_string_free (s, TRUE); + } + + return ret; +} +#endif + /** * katze_property_proxy: * @object: a #GObject @@ -173,11 +442,22 @@ proxy_widget_string_destroy_cb (GtkWidget* proxy, * Since 0.2.0 the following hints are also supported: * "font-monospace": the widget created will be particularly suitable for * choosing a fixed-width font from installed fonts. + * Since 0.2.1 the following hints are also supported: + * "application-TYPE": the widget created will be particularly suitable + * for choosing an application to open TYPE files, ie. "text/plain". + * "application-CATEGORY": the widget created will be particularly suitable + * for choosing an application to open CATEGORY files, ie. "Network". + * "custom-PROPERTY": the last value of an enumeration will be the "custom" + * value, where the user may enter text freely, which then updates + * the property PROPERTY instead. This applies only to enumerations. * * Any other values for @hint are silently ignored. * * Since 0.1.2 strings without hints and booleans are truly synchronous - * including property changes causing the proxy to be updated. + * including property changes causing the proxy to be updated. + * + * Since 0.2.1 the proxy may contain a label if the platform + * has according widgets. * * Return value: a new widget **/ @@ -216,12 +496,23 @@ katze_property_proxy (gpointer object, gchar* notify_property; gboolean toggled = katze_object_get_boolean (object, property); - widget = gtk_check_button_new (); - if (_hint == g_intern_string ("toggle")) - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE); - else + #ifdef HAVE_HILDON_2_2 + if (_hint != g_intern_string ("toggle")) + { + widget = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); gtk_button_set_label (GTK_BUTTON (widget), gettext (nick)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); + hildon_check_button_set_active (HILDON_CHECK_BUTTON (widget), toggled); + } + else + #endif + { + widget = gtk_check_button_new (); + if (_hint == g_intern_string ("toggle")) + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE); + else + gtk_button_set_label (GTK_BUTTON (widget), gettext (nick)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); + } g_signal_connect (widget, "toggled", G_CALLBACK (proxy_toggle_button_toggled_cb), object); notify_property = g_strdup_printf ("notify::%s", property); @@ -295,6 +586,9 @@ katze_property_proxy (gpointer object, pango_context_list_families (context, &families, &n_families); if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); + /* 'sans' and 'sans-serif' are presumably the same */ + if (!g_strcmp0 (string, "sans-serif")) + katze_assign (string, g_strdup ("sans")); if (string) { gint j = 0; @@ -315,6 +609,101 @@ katze_property_proxy (gpointer object, G_CALLBACK (proxy_combo_box_text_changed_cb), object); g_free (families); } + else if (type == G_TYPE_PARAM_STRING && hint && g_str_has_prefix (hint, "application-")) + { + GtkListStore* model; + GtkCellRenderer* renderer; + GtkComboBox* combo; + GList* apps; + const gchar* app_type = &hint[12]; + gint icon_width = 16; + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL); + + model = gtk_list_store_new (4, G_TYPE_APP_INFO, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_INT); + widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model)); + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "icon-name", 1); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "width", 3); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2); + combo = GTK_COMBO_BOX (widget); + apps = g_app_info_get_all_for_type (app_type); + if (!apps) + apps = katze_app_info_get_all_for_category (app_type); + + string = katze_object_get_string (object, property); + if (!g_strcmp0 (string, "")) + katze_assign (string, NULL); + + if (apps) + { + GtkTreeIter iter_none; + gint i = 0; + GAppInfo* info; + + gtk_list_store_insert_with_values (model, &iter_none, 0, + 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); + + while ((info = g_list_nth_data (apps, i++))) + { + const gchar* name = g_app_info_get_name (info); + GIcon* icon = g_app_info_get_icon (info); + gchar* icon_name; + GtkTreeIter iter; + + if (!g_app_info_should_show (info)) + continue; + + icon_name = icon ? g_icon_to_string (icon) : NULL; + gtk_list_store_insert_with_values (model, &iter, G_MAXINT, + 0, info, 1, icon_name, 2, name, 3, icon_width, -1); + if (string && !strcmp (katze_app_info_get_commandline (info), string)) + gtk_combo_box_set_active_iter (combo, &iter); + + g_free (icon_name); + } + + info = g_app_info_create_from_commandline ("", + "", G_APP_INFO_CREATE_NONE, NULL); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, info, 1, NULL, 2, _("Custom..."), 3, icon_width, -1); + g_object_unref (info); + + if (gtk_combo_box_get_active (combo) == -1) + { + if (string) + { + GtkWidget* entry; + const gchar* exe; + + info = g_app_info_create_from_commandline (string, + NULL, G_APP_INFO_CREATE_NONE, NULL); + #if !GLIB_CHECK_VERSION (2, 20, 0) + g_object_set_data (G_OBJECT (info), "katze-cmdline", string); + #endif + entry = gtk_entry_new (); + exe = g_app_info_get_executable (info); + if (exe && *exe && strcmp (exe, "%f")) + gtk_entry_set_text (GTK_ENTRY (entry), string); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (combo), entry); + g_object_unref (info); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + g_object_set_data_full (G_OBJECT (entry), "property", + g_strdup (property), g_free); + } + else + gtk_combo_box_set_active_iter (combo, &iter_none); + } + } + g_list_free (apps); + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_combo_box_apps_changed_cb), object); + } else if (type == G_TYPE_PARAM_STRING) { gchar* notify_property; @@ -356,6 +745,10 @@ katze_property_proxy (gpointer object, widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_INT (pspec)->minimum, G_PARAM_SPEC_INT (pspec)->maximum, 1); + #if HAVE_HILDON + hildon_gtk_entry_set_input_mode (GTK_ENTRY (widget), + HILDON_GTK_INPUT_MODE_NUMERIC); + #endif /* Keep it narrow, 5 digits are usually fine */ gtk_entry_set_width_chars (GTK_ENTRY (widget), 5); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); @@ -368,23 +761,81 @@ katze_property_proxy (gpointer object, GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_ref (pspec->value_type)); gint value = katze_object_get_enum (object, property); + const gchar* custom = NULL; + + if (hint && g_str_has_prefix (hint, "custom-")) + custom = &hint[7]; + #ifdef HAVE_HILDON_2_2 + GtkWidget* selector; + + widget = hildon_picker_button_new ( + HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, + HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + selector = hildon_touch_selector_new_text (); + hildon_button_set_title (HILDON_BUTTON (widget), gettext (nick)); + hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (widget), + HILDON_TOUCH_SELECTOR (selector)); + #else widget = gtk_combo_box_new_text (); + #endif for (i = 0; i < enum_class->n_values; i++) { const gchar* label = gettext (enum_class->values[i].value_nick); + #ifdef HAVE_HILDON_2_2 + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), label); + #else gtk_combo_box_append_text (GTK_COMBO_BOX (widget), label); + #endif } + #ifdef HAVE_HILDON_2_2 + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, value); + g_signal_connect (widget, "value-changed", + G_CALLBACK (proxy_picker_button_changed_cb), object); + #else gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value); g_signal_connect (widget, "changed", G_CALLBACK (proxy_combo_box_changed_cb), object); + #endif + if (custom) + { + gchar* custom_text = katze_object_get_string (object, custom); + + if (value == (gint)(enum_class->n_values - 1)) + { + GtkWidget* entry = gtk_entry_new (); + gchar* text = katze_object_get_string (object, custom); + if (text && *text) + gtk_entry_set_text (GTK_ENTRY (entry), text); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (widget), entry); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + g_object_set_data_full (G_OBJECT (entry), "property", + g_strdup (custom), g_free); + } + #if GTK_CHECK_VERSION (2, 12, 0) + else + gtk_widget_set_tooltip_text (widget, custom_text); + #endif + + g_free (custom_text); + + g_object_set_data (G_OBJECT (widget), "katze-custom-value", + GINT_TO_POINTER (enum_class->n_values - 1)); + g_object_set_data (G_OBJECT (widget), "katze-custom-property", + (gpointer)custom); + } g_type_class_unref (enum_class); } else widget = gtk_label_new (gettext (nick)); g_free (string); - gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); + #if GTK_CHECK_VERSION (2, 12, 0) + if (!gtk_widget_get_tooltip_text (widget)) + gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); + #endif gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); g_object_set_data_full (G_OBJECT (widget), "property", @@ -401,6 +852,9 @@ katze_property_proxy (gpointer object, * Create a label widget displaying the name of the specified object's property. * * Return value: a new label widget + * + * Since 0.2.1 the label will be empty if the property proxy for the + * same property would contain a label already. **/ GtkWidget* katze_property_label (gpointer object, @@ -421,8 +875,18 @@ katze_property_label (gpointer object, property, G_OBJECT_CLASS_NAME (class)); return gtk_label_new (property); } + + #ifdef HAVE_HILDON_2_2 + if (G_PARAM_SPEC_TYPE (pspec) == G_TYPE_PARAM_ENUM) + return gtk_label_new (NULL); + #endif + nick = g_param_spec_get_nick (pspec); widget = gtk_label_new (nick); + #if GTK_CHECK_VERSION (2, 12, 0) + gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); + #endif + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); return widget; } @@ -849,3 +1313,167 @@ katze_object_get_object (gpointer object, g_object_get (object, property, &value, NULL); return value; } + +/** + * katze_mkdir_with_parents: + * @pathname: a pathname in the GLib file name encoding + * @mode: permissions to use for newly created directories + * + * Create a directory if it doesn't already exist. Create intermediate + * parent directories as needed, too. + * + * Similar to g_mkdir_with_parents() but returning early if the + * @pathname refers to an existing directory. + * + * Returns: 0 if the directory already exists, or was successfully + * created. Returns -1 if an error occurred, with errno set. + * + * Since: 0.2.1 + */ +/* Creating directories recursively + Copyright 2000 Red Hat, Inc. + Originally copied from Glib 2.20, coding style adjusted + Modified to determine file existence early and pathname must be != NULL */ +int +katze_mkdir_with_parents (const gchar* pathname, + int mode) +{ + gchar* fn, *p; + + if (g_file_test (pathname, G_FILE_TEST_EXISTS)) + return 0; + + fn = g_strdup (pathname); + + if (g_path_is_absolute (fn)) + p = (gchar *) g_path_skip_root (fn); + else + p = fn; + + do + { + while (*p && !G_IS_DIR_SEPARATOR (*p)) + p++; + + if (!*p) + p = NULL; + else + *p = '\0'; + + if (!g_file_test (fn, G_FILE_TEST_EXISTS)) + { + if (g_mkdir (fn, mode) == -1) + { + g_free (fn); + return -1; + } + } + else if (!g_file_test (fn, G_FILE_TEST_IS_DIR)) + { + g_free (fn); + return -1; + } + if (p) + { + *p++ = G_DIR_SEPARATOR; + while (*p && G_IS_DIR_SEPARATOR (*p)) + p++; + } + } + while (p); + + g_free (fn); + + return 0; +} + +/** + * katze_widget_has_touchscreen_mode: + * @widget: a #GtkWidget, or %NULL + * + * Determines whether @widget should operate in touchscreen + * mode, as determined by GtkSettings or the environment + * variable MIDORI_TOUCHSCREEN. + * + * If @widget is %NULL, the default screen will be used. + * + * Returns: %TRUE if touchscreen mode should be used + * + * Since: 0.2.1 + */ +gboolean +katze_widget_has_touchscreen_mode (GtkWidget* widget) +{ + const gchar* touchscreen = g_getenv ("MIDORI_TOUCHSCREEN"); + if (touchscreen && touchscreen[0] == '1') + return TRUE; + else if (touchscreen && touchscreen[0] == '0') + return FALSE; + else + { + GdkScreen* screen = widget && gtk_widget_has_screen (widget) + ? gtk_widget_get_screen (widget) : gdk_screen_get_default (); + GtkSettings* gtk_settings = gtk_settings_get_for_screen (screen); + gboolean enabled; + g_object_get (gtk_settings, "gtk-touchscreen-mode", &enabled, NULL); + return enabled; + } +} + +/** + * katze_load_cached_icon: + * @uri: an URI string + * @widget: a #GtkWidget, or %NULL + * + * Loads a cached icon for the specified @uri. If there is no + * icon and @widget is specified, a default will be returned. + * + * Returns: a #GdkPixbuf, or %NULL + * + * Since: 0.2.2 + */ +GdkPixbuf* +katze_load_cached_icon (const gchar* uri, + GtkWidget* widget) +{ + GdkPixbuf* icon = NULL; + + if (g_str_has_prefix (uri, "http://")) + { + guint i; + gchar* icon_uri; + gchar* checksum; + gchar* ext; + gchar* filename; + gchar* path; + + i = 8; + while (uri[i] != '\0' && uri[i] != '/') + i++; + if (uri[i] == '/') + { + icon_uri = g_strdup (uri); + icon_uri[i] = '\0'; + icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri); + } + else + icon_uri = g_strdup_printf ("%s/favicon.ico", uri); + + checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, icon_uri, -1); + ext = g_strrstr (icon_uri, "."); + g_free (icon_uri); + filename = g_strdup_printf ("%s%s", checksum, ext ? ext : ""); + g_free (checksum); + path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, + "icons", filename, NULL); + if ((icon = gdk_pixbuf_new_from_file_at_size (path, 16, 16, NULL))) + { + g_free (path); + return icon; + } + g_free (path); + } + + return icon || !widget ? icon : gtk_widget_render_icon (widget, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); +} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 5d237d16..c8648ff2 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -34,11 +34,12 @@ G_BEGIN_DECLS * Frees @lvalue if needed and assigns it the value of @rvalue. **/ #define katze_assign(lvalue, rvalue) \ - if (1) \ + do \ { \ g_free (lvalue); \ lvalue = rvalue; \ - } + } \ + while (0) /** * katze_object_assign: @@ -48,12 +49,13 @@ G_BEGIN_DECLS * Unrefs @lvalue if needed and assigns it the value of @rvalue. **/ #define katze_object_assign(lvalue, rvalue) \ - if (1) \ + do \ { \ if (lvalue) \ g_object_unref (lvalue); \ lvalue = rvalue; \ - } + } \ + while (0) /** * katze_strv_assign: @@ -65,11 +67,12 @@ G_BEGIN_DECLS * Since: 0.1.7 **/ #define katze_strv_assign(lvalue, rvalue) \ - if (1) \ + do \ { \ g_strfreev (lvalue); \ lvalue = rvalue; \ - } + } \ + while (0) GtkWidget* katze_property_proxy (gpointer object, @@ -137,6 +140,17 @@ gpointer katze_object_get_object (gpointer object, const gchar* property); +int +katze_mkdir_with_parents (const gchar* pathname, + int mode); + +gboolean +katze_widget_has_touchscreen_mode (GtkWidget* widget); + +GdkPixbuf* +katze_load_cached_icon (const gchar* uri, + GtkWidget* widget); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ diff --git a/katze/katze.h b/katze/katze.h index ab85d27b..367fd447 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -22,5 +22,6 @@ #include "katze-separatoraction.h" #include "katze-net.h" #include "katze-scrolled.h" +#include "katze-preferences.h" #endif /* __KATZE_H__ */ diff --git a/katze/wscript_build b/katze/wscript_build index 9dbf09e3..572bdd1f 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -10,5 +10,5 @@ obj.target = 'katze' obj.includes = '. ../.' obj.find_sources_in_dirs ('.') obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal') -obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML WEBKIT' +obj.uselib = 'M GMODULE LIBSOUP GTK HILDON LIBXML WEBKIT' obj.install_path = None diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index d34ff962..c2145684 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -39,6 +39,7 @@ G_BEGIN_DECLS #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY #define gtk_icon_entry_new gtk_entry_new #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock + #define gtk_icon_entry_set_icon_from_icon_name gtk_entry_set_icon_from_icon_name void gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, diff --git a/midori/main.c b/midori/main.c index b4ed755b..77c0cd52 100644 --- a/midori/main.c +++ b/midori/main.c @@ -29,12 +29,8 @@ #if HAVE_UNISTD_H #include - #define is_writable(_cfg_filename) \ - !g_access (_cfg_filename, W_OK) || \ - !g_file_test (_cfg_filename, G_FILE_TEST_EXISTS) -#else - #define is_writable(_cfg_filename) 1 #endif + #include #include #include @@ -50,8 +46,14 @@ #include #endif +#ifdef HAVE_SIGNAL_H + #include +#endif + #if HAVE_HILDON - #include + #define BOOKMARK_FILE "/home/user/.bookmarks/MyBookmarks.xml" +#else + #define BOOKMARK_FILE "bookmarks.xbel" #endif #define MIDORI_HISTORY_ERROR g_quark_from_string("MIDORI_HISTORY_ERROR") @@ -66,8 +68,11 @@ typedef enum static gchar* build_config_filename (const gchar* filename) { - const gchar* path = sokoke_set_config_dir (NULL); - g_mkdir_with_parents (path, 0700); + const gchar* path; + + if (g_path_is_absolute (filename)) + return g_strdup (filename); + path = sokoke_set_config_dir (NULL); return g_build_filename (path, filename, NULL); } @@ -199,47 +204,52 @@ settings_save_to_file (MidoriWebSettings* settings, type = G_PARAM_SPEC_TYPE (pspec); property = g_param_spec_get_name (pspec); if (!(pspec->flags & G_PARAM_WRITABLE)) - { - gchar* prop_comment = g_strdup_printf ("# %s", property); - g_key_file_set_string (key_file, "settings", prop_comment, ""); - g_free (prop_comment); continue; - } if (type == G_TYPE_PARAM_STRING) { gchar* string; + const gchar* def_string = G_PARAM_SPEC_STRING (pspec)->default_value; g_object_get (settings, property, &string, NULL); - g_key_file_set_string (key_file, "settings", property, - string ? string : ""); + if (!string) + string = g_strdup (""); + if (!def_string) + def_string = ""; + if (strcmp (string, def_string)) + g_key_file_set_string (key_file, "settings", property, string); g_free (string); } else if (type == G_TYPE_PARAM_INT) { gint integer; g_object_get (settings, property, &integer, NULL); - g_key_file_set_integer (key_file, "settings", property, integer); + if (integer != G_PARAM_SPEC_INT (pspec)->default_value) + g_key_file_set_integer (key_file, "settings", property, integer); } else if (type == G_TYPE_PARAM_FLOAT) { gfloat number; g_object_get (settings, property, &number, NULL); - g_key_file_set_double (key_file, "settings", property, number); + if (number != G_PARAM_SPEC_FLOAT (pspec)->default_value) + g_key_file_set_double (key_file, "settings", property, number); } else if (type == G_TYPE_PARAM_BOOLEAN) { gboolean truth; g_object_get (settings, property, &truth, NULL); - g_key_file_set_boolean (key_file, "settings", property, truth); + if (truth != G_PARAM_SPEC_BOOLEAN (pspec)->default_value) + g_key_file_set_boolean (key_file, "settings", property, truth); } else if (type == G_TYPE_PARAM_ENUM) { GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_ref (pspec->value_type)); gint integer; + GEnumValue* enum_value; g_object_get (settings, property, &integer, NULL); - GEnumValue* enum_value = g_enum_get_value (enum_class, integer); - g_key_file_set_string (key_file, "settings", property, - enum_value->value_name); + enum_value = g_enum_get_value (enum_class, integer); + if (integer != G_PARAM_SPEC_ENUM (pspec)->default_value) + g_key_file_set_string (key_file, "settings", property, + enum_value->value_name); } else g_warning (_("Invalid configuration value '%s'"), property); @@ -445,7 +455,7 @@ midori_history_remove_item_cb (KatzeArray* history, sqlcmd = sqlite3_mprintf ( "DELETE FROM history WHERE uri = '%q' AND" - " title = '%q' AND date = %" G_GINT64_FORMAT, + " title = '%q' AND date = %llu", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item)); @@ -491,7 +501,7 @@ midori_history_notify_item_cb (KatzeItem* item, GError* error = NULL; sqlcmd = sqlite3_mprintf ("UPDATE history SET title='%q' WHERE " - "uri='%q' AND date=%" G_GUINT64_FORMAT, + "uri='%q' AND date=%llu", katze_item_get_name (item), katze_item_get_uri (item), katze_item_get_added (item)); @@ -539,8 +549,8 @@ midori_history_add_item_cb (KatzeArray* array, } } sqlcmd = sqlite3_mprintf ("INSERT INTO history VALUES" - "('%q', '%q', %" G_GUINT64_FORMAT "," - " %" G_GUINT64_FORMAT ")", + "('%q', '%q', %llu," + " %llu)", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item), @@ -810,7 +820,7 @@ midori_bookmarks_notify_item_cb (KatzeArray* folder, gchar* config_file; GError* error; - config_file = build_config_filename ("bookmarks.xbel"); + config_file = build_config_filename (BOOKMARK_FILE); error = NULL; if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { @@ -822,7 +832,7 @@ midori_bookmarks_notify_item_cb (KatzeArray* folder, static void midori_bookmarks_add_item_cb (KatzeArray* folder, - GObject* item, + KatzeItem* item, KatzeArray* bookmarks); static void @@ -830,15 +840,37 @@ midori_bookmarks_remove_item_cb (KatzeArray* folder, GObject* item, KatzeArray* bookmarks); +static void +midori_bookmarks_connect_item (KatzeArray* folder, + KatzeItem* item, + KatzeArray* bookmarks) +{ + if (KATZE_IS_ARRAY (item)) + { + KatzeItem* child; + guint i = 0; + while ((child = katze_array_get_nth_item ((KatzeArray*)item, i++))) + midori_bookmarks_connect_item ((KatzeArray*)item, child, bookmarks); + + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect_after (item, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); + } + + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); +} + static void midori_bookmarks_add_item_cb (KatzeArray* folder, - GObject* item, + KatzeItem* item, KatzeArray* bookmarks) { gchar* config_file; GError* error; - config_file = build_config_filename ("bookmarks.xbel"); + config_file = build_config_filename (BOOKMARK_FILE); error = NULL; if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { @@ -847,16 +879,7 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, } g_free (config_file); - if (folder == bookmarks && KATZE_IS_ARRAY (item)) - { - g_signal_connect_after (item, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - } - - g_signal_connect_after (item, "notify", - G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); + midori_bookmarks_connect_item (folder, item, bookmarks); } static void @@ -867,7 +890,7 @@ midori_bookmarks_remove_item_cb (KatzeArray* folder, gchar* config_file; GError* error; - config_file = build_config_filename ("bookmarks.xbel"); + config_file = build_config_filename (BOOKMARK_FILE); error = NULL; if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { @@ -877,8 +900,15 @@ midori_bookmarks_remove_item_cb (KatzeArray* folder, g_free (config_file); if (KATZE_IS_ARRAY (item)) + { g_signal_handlers_disconnect_by_func (item, midori_bookmarks_add_item_cb, bookmarks); + g_signal_handlers_disconnect_by_func (item, + midori_bookmarks_remove_item_cb, bookmarks); + } + + g_signal_handlers_disconnect_by_func (item, + midori_bookmarks_notify_item_cb, bookmarks); } static void @@ -966,8 +996,9 @@ midori_app_add_browser_cb (MidoriApp* app, midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Extensions */ - addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL); + addon = g_object_new (MIDORI_TYPE_EXTENSIONS, NULL); gtk_widget_show (addon); + g_object_set (addon, "app", app, NULL); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); g_object_unref (panel); @@ -1308,7 +1339,6 @@ midori_load_extensions (gpointer data) { const gchar* filename; gchar* config_file = build_config_filename ("config"); - gboolean is_writable = is_writable (config_file); while ((filename = g_dir_read_name (extension_dir))) { @@ -1352,13 +1382,10 @@ midori_load_extensions (gpointer data) if (!g_strcmp0 (filename, name)) g_signal_emit_by_name (extension, "activate", app); } - if (is_writable) - { - g_signal_connect_after (extension, "activate", - G_CALLBACK (extension_activate_cb), app); - g_signal_connect_after (extension, "deactivate", - G_CALLBACK (extension_activate_cb), app); - } + g_signal_connect_after (extension, "activate", + G_CALLBACK (extension_activate_cb), app); + g_signal_connect_after (extension, "deactivate", + G_CALLBACK (extension_activate_cb), app); g_object_unref (extension); } g_dir_close (extension_dir); @@ -1419,15 +1446,14 @@ midori_load_session (gpointer data) GtkAction* action = gtk_action_group_get_action (action_group, "LastSession"); g_signal_connect (action, "activate", G_CALLBACK (midori_browser_action_last_session_activate_cb), browser); - gtk_action_set_sensitive (action, TRUE); + gtk_action_set_visible (action, TRUE); } midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); katze_assign (config_file, build_config_filename ("accels")); - if (is_writable (config_file)) - g_signal_connect_after (gtk_accel_map_get (), "changed", - G_CALLBACK (accel_map_changed_cb), NULL); + g_signal_connect_after (gtk_accel_map_get (), "changed", + G_CALLBACK (accel_map_changed_cb), NULL); if (katze_array_is_empty (_session)) { @@ -1465,17 +1491,14 @@ midori_load_session (gpointer data) g_object_unref (_session); katze_assign (config_file, build_config_filename ("session.xbel")); - if (is_writable (config_file)) - { - g_signal_connect_after (browser, "notify::uri", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "add-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "remove-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_object_weak_ref (G_OBJECT (session), - (GWeakNotify)(midori_browser_weak_notify_cb), browser); - } + g_signal_connect_after (browser, "notify::uri", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "add-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "remove-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_object_weak_ref (G_OBJECT (session), + (GWeakNotify)(midori_browser_weak_notify_cb), browser); if (command) midori_app_send_command (app, command); @@ -1569,12 +1592,22 @@ midori_remove_config_file (gint clear_prefs, if ((clear_prefs & flag) == flag) { gchar* config_file = build_config_filename (filename); - if (is_writable (config_file)) - g_unlink (config_file); + g_unlink (config_file); g_free (config_file); } } +#ifdef HAVE_SIGNAL_H +static void +signal_handler (int signal_id) +{ + signal (signal_id, 0); + midori_app_quit_cb (NULL); + if (kill (getpid (), signal_id)) + exit (1); +} +#endif + int main (int argc, char** argv) @@ -1593,8 +1626,10 @@ main (int argc, { { "app", 'a', 0, G_OPTION_ARG_STRING, &webapp, N_("Run ADDRESS as a web application"), N_("ADDRESS") }, + #if !HAVE_HILDON { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, + #endif { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, #if WEBKIT_CHECK_VERSION (1, 1, 6) @@ -1627,9 +1662,6 @@ main (int argc, sqlite3* db; gint max_history_age; #endif - #if HAVE_HILDON - osso_context_t* osso_context; - #endif gint clear_prefs = MIDORI_CLEAR_NONE; #if ENABLE_NLS @@ -1650,6 +1682,21 @@ main (int argc, textdomain (GETTEXT_PACKAGE); #endif + #ifdef HAVE_SIGNAL_H + #ifdef SIGHUP + signal (SIGHUP, &signal_handler); + #endif + #ifdef SIGINT + signal (SIGINT, &signal_handler); + #endif + #ifdef SIGTERM + signal (SIGTERM, &signal_handler); + #endif + #ifdef SIGQUIT + signal (SIGQUIT, &signal_handler); + #endif + #endif + /* Parse cli options */ webapp = NULL; config = NULL; @@ -1736,14 +1783,26 @@ main (int argc, NULL); g_object_unref (settings); g_object_set (browser, "settings", settings, NULL); + sokoke_set_config_dir ("/"); g_signal_connect (browser, "notify::load-status", G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL); midori_browser_add_uri (browser, webapp); g_object_set_data (G_OBJECT (browser), "locked", (void*)1); + g_signal_connect (browser, "quit", + G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (browser, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (GTK_WIDGET (browser)); midori_browser_activate_action (browser, "Location"); + if (execute) + { + i = 0; + while (uris[i] != NULL) + { + midori_browser_activate_action (browser, uris[i]); + i++; + } + } gtk_main (); return 0; } @@ -1752,16 +1811,6 @@ main (int argc, if (run) return midori_run_script (uris ? *uris : NULL); - #if HAVE_HILDON - osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); - - if (!osso_context) - { - g_critical ("Error initializing OSSO D-Bus context - Midori"); - return 1; - } - #endif - if (config && !g_path_is_absolute (config)) { g_critical (_("The specified configuration folder is invalid.")); @@ -1819,12 +1868,16 @@ main (int argc, return 1; } + katze_mkdir_with_parents (sokoke_set_config_dir (NULL), 0700); + /* Load configuration files */ error_messages = g_string_new (NULL); config_file = build_config_filename ("config"); error = NULL; settings = settings_new_from_file (config_file, &extensions); katze_assign (config_file, build_config_filename ("accels")); + if (!g_file_test (config_file, G_FILE_TEST_EXISTS)) + katze_assign (config_file, sokoke_find_config_filename (NULL, "accels")); gtk_accel_map_load (config_file); katze_assign (config_file, build_config_filename ("search")); error = NULL; @@ -1862,7 +1915,7 @@ main (int argc, } bookmarks = katze_array_new (KATZE_TYPE_ARRAY); #if HAVE_LIBXML - katze_assign (config_file, build_config_filename ("bookmarks.xbel")); + katze_assign (config_file, build_config_filename (BOOKMARK_FILE)); error = NULL; if (!midori_array_from_file (bookmarks, config_file, "xbel", &error)) { @@ -1974,7 +2027,9 @@ main (int argc, { item = katze_item_new (); /* Construct an absolute path if the file is relative */ - if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + if (g_path_is_absolute (uri)) + uri_ready = g_strconcat ("file://", uri, NULL); + else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { gchar* current_dir = g_get_current_dir (); uri_ready = g_strconcat ("file://", current_dir, @@ -1994,12 +2049,11 @@ main (int argc, } katze_assign (config_file, build_config_filename ("config")); - if (is_writable (config_file)) - g_signal_connect_after (settings, "notify", - G_CALLBACK (settings_notify_cb), app); + g_signal_connect_after (settings, "notify", + G_CALLBACK (settings_notify_cb), app); katze_assign (config_file, build_config_filename ("search")); - if (is_writable (config_file)) + if (1) { g_signal_connect_after (search_engines, "add-item", G_CALLBACK (midori_search_engines_modify_cb), search_engines); @@ -2013,47 +2067,27 @@ main (int argc, G_CALLBACK (midori_search_engines_modify_cb), search_engines); } } - katze_assign (config_file, build_config_filename ("bookmarks.xbel")); - if (is_writable (config_file)) + katze_assign (config_file, build_config_filename (BOOKMARK_FILE)); + /* Don't save bookmarks if they are not our own */ + if (!g_path_is_absolute (BOOKMARK_FILE)) { + midori_bookmarks_connect_item (NULL, (KatzeItem*)bookmarks, bookmarks); g_signal_connect_after (bookmarks, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (bookmarks, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - if (!katze_array_is_empty (bookmarks)) - { - i = 0; - while ((item = katze_array_get_nth_item (bookmarks, i++))) - { - if (KATZE_IS_ARRAY (item)) - { - g_signal_connect_after (item, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - } - g_signal_connect_after (item, "notify", - G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); - } - } } katze_assign (config_file, build_config_filename ("tabtrash.xbel")); - if (is_writable (config_file)) - { - g_signal_connect_after (trash, "add-item", - G_CALLBACK (midori_trash_add_item_cb), NULL); - g_signal_connect_after (trash, "remove-item", - G_CALLBACK (midori_trash_remove_item_cb), NULL); - } + g_signal_connect_after (trash, "add-item", + G_CALLBACK (midori_trash_add_item_cb), NULL); + g_signal_connect_after (trash, "remove-item", + G_CALLBACK (midori_trash_remove_item_cb), NULL); #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("history.db")); - if (is_writable (config_file)) - { - g_signal_connect_after (history, "add-item", - G_CALLBACK (midori_history_add_item_cb), db); - g_signal_connect_after (history, "clear", - G_CALLBACK (midori_history_clear_cb), db); - } + g_signal_connect_after (history, "add-item", + G_CALLBACK (midori_history_add_item_cb), db); + g_signal_connect_after (history, "clear", + G_CALLBACK (midori_history_clear_cb), db); #endif katze_item_set_parent (KATZE_ITEM (_session), app); @@ -2095,10 +2129,6 @@ main (int argc, gtk_main (); - #if HAVE_HILDON - osso_deinitialize (osso_context); - #endif - settings = katze_object_get_object (app, "settings"); #if HAVE_SQLITE g_object_get (settings, "maximum-history-age", &max_history_age, NULL); @@ -2128,14 +2158,20 @@ main (int argc, g_free (cache); } midori_remove_config_file (clear_prefs, MIDORI_CLEAR_TRASH, "tabtrash.xbel"); + if ((clear_prefs & MIDORI_CLEAR_WEB_CACHE) == MIDORI_CLEAR_WEB_CACHE) + { + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + } } if (katze_object_get_boolean (settings, "load-on-startup") != MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, build_config_filename ("session.xbel")); - if (is_writable (config_file)) - g_unlink (config_file); + g_unlink (config_file); } g_object_unref (settings); diff --git a/midori/marshal.list b/midori/marshal.list index 5ca263be..8d27c7c6 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -1,5 +1,6 @@ BOOLEAN:OBJECT BOOLEAN:VOID +OBJECT:OBJECT VOID:BOOLEAN,STRING VOID:OBJECT,ENUM VOID:STRING,BOOLEAN diff --git a/midori/midori-app.c b/midori/midori-app.c index e71f4b08..05742594 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -20,7 +20,16 @@ #include #include -#if HAVE_UNIQUE +#if HAVE_HILDON + #include + #ifdef HAVE_HILDON_2_2 + #include + #include + #include + #endif + typedef osso_context_t* MidoriAppInstance; + #define MidoriAppInstanceNull NULL +#elif HAVE_UNIQUE typedef gpointer MidoriAppInstance; #define MidoriAppInstanceNull NULL #include @@ -31,19 +40,9 @@ #include "socket.h" #endif -typedef struct _NotifyNotification NotifyNotification; - -typedef struct -{ - gboolean (*init) (const gchar* app_name); - void (*uninit) (void); - NotifyNotification* (*notification_new) (const gchar* summary, - const gchar* body, - const gchar* icon, - GtkWidget* attach); - gboolean (*notification_show) (NotifyNotification* notification, - GError** error); -} LibNotifyFuncs; +#if HAVE_LIBNOTIFY + #include +#endif struct _MidoriApp { @@ -63,10 +62,9 @@ struct _MidoriApp MidoriAppInstance instance; - /* libnotify handling */ - gchar* program_notify_send; - GModule* libnotify_module; - LibNotifyFuncs libnotify_funcs; + #if !HAVE_HILDON + gchar* program_notify_send; + #endif }; struct _MidoriAppClass @@ -115,9 +113,6 @@ static guint signals[LAST_SIGNAL]; static void midori_app_finalize (GObject* object); -static void -midori_app_init_libnotify (MidoriApp* app); - static void midori_app_set_property (GObject* object, guint prop_id, @@ -140,21 +135,26 @@ midori_browser_focus_in_event_cb (MidoriBrowser* browser, return FALSE; } -static void +static MidoriBrowser* midori_browser_new_window_cb (MidoriBrowser* browser, MidoriBrowser* new_browser, MidoriApp* app) { - g_object_set (new_browser, - "settings", app->settings, - "bookmarks", app->bookmarks, - "trash", app->trash, - "search-engines", app->search_engines, - "history", app->history, - NULL); + if (new_browser) + g_object_set (new_browser, + "settings", app->settings, + "bookmarks", app->bookmarks, + "trash", app->trash, + "search-engines", app->search_engines, + "history", app->history, + NULL); + else + new_browser = midori_app_create_browser (app); midori_app_add_browser (app, new_browser); gtk_widget_show (GTK_WIDGET (new_browser)); + + return new_browser; } static gboolean @@ -407,6 +407,9 @@ midori_app_command_received (MidoriApp* app, if (g_str_equal (command, "activate")) { + if (!app->browser) + return FALSE; + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); gtk_window_present (GTK_WINDOW (app->browser)); return TRUE; @@ -424,6 +427,9 @@ midori_app_command_received (MidoriApp* app, } else if (g_str_equal (command, "open")) { + if (!app->browser) + return FALSE; + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); gtk_window_present (GTK_WINDOW (app->browser)); if (!uris) @@ -465,16 +471,51 @@ midori_app_command_received (MidoriApp* app, } else if (g_str_equal (command, "command")) { + guint i = 0; + if (!uris || !app->browser) return FALSE; - midori_browser_activate_action (app->browser, *uris); + while (uris[i] != NULL) + { + midori_browser_activate_action (app->browser, uris[i]); + i++; + } return TRUE; } return FALSE; } -#if HAVE_UNIQUE +#if HAVE_HILDON +static osso_return_t +midori_app_osso_rpc_handler_cb (const gchar* interface, + const gchar* method, + GArray* arguments, + gpointer data, + osso_rpc_t * retval) +{ + MidoriApp* app = MIDORI_APP (data); + GdkScreen* screen = NULL; + gboolean success; + + if (!g_strcmp0 (method, "top_application")) + success = midori_app_command_received (app, "activate", NULL, screen); + else if (!g_strcmp0 (method, "new")) + success = midori_app_command_received (app, "new", NULL, screen); + else if (!g_strcmp0 (method, "open")) + { + /* FIXME: Handle arguments */ + success = midori_app_command_received (app, "open", NULL, screen); + } + else if (!g_strcmp0 (method, "command")) + { + /* FIXME: Handle arguments */ + success = midori_app_command_received (app, "command", NULL, screen); + } + + return success ? OSSO_OK : OSSO_INVALID; +} +#elif HAVE_UNIQUE static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, UniqueCommand command, @@ -577,6 +618,30 @@ midori_app_create_instance (MidoriApp* app, const gchar* name) { MidoriAppInstance instance; + + #if HAVE_HILDON + instance = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); + + if (!instance) + { + g_critical ("Error initializing OSSO D-Bus context - Midori"); + return NULL; + } + + if (osso_rpc_set_default_cb_f (instance, midori_app_osso_rpc_handler_cb, + app) != OSSO_OK) + { + g_critical ("Error initializing remote procedure call handler - Midori"); + osso_deinitialize (instance); + return NULL; + } + + #ifdef HAVE_HILDON_2_2 + if (OSSO_OK == osso_rpc_run_system (instance, MCE_SERVICE, MCE_REQUEST_PATH, + MCE_REQUEST_IF, MCE_ACCELEROMETER_ENABLE_REQ, NULL, DBUS_TYPE_INVALID)) + /* Accelerometer enabled */; + #endif + #else GdkDisplay* display; gchar* display_name; gchar* instance_name; @@ -595,7 +660,8 @@ midori_app_create_instance (MidoriApp* app, display_name = g_strdup (gdk_display_get_name (display)); n = strlen (display_name); for (i = 0; i < n; i++) - if (display_name[i] == ':' || display_name[i] == '.') + if (display_name[i] == ':' || display_name[i] == '.' + || display_name[i] == '\\') display_name[i] = '_'; instance_name = g_strdup_printf ("de.twotoasts.%s_%s", name, display_name); @@ -608,14 +674,18 @@ midori_app_create_instance (MidoriApp* app, instance = socket_init (instance_name, sokoke_set_config_dir (NULL), &exists); g_object_set_data (G_OBJECT (app), "sock-exists", exists ? (gpointer)0xdeadbeef : NULL); - channel = g_io_channel_unix_new (instance); - g_io_add_watch (channel, G_IO_IN | G_IO_PRI | G_IO_ERR, - (GIOFunc)midori_app_io_channel_watch_cb, app); + if (instance != MidoriAppInstanceNull) + { + channel = g_io_channel_unix_new (instance); + g_io_add_watch (channel, G_IO_IN | G_IO_PRI | G_IO_ERR, + (GIOFunc)midori_app_io_channel_watch_cb, app); + } #endif g_free (instance_name); g_free (display_name); + #endif return instance; } @@ -634,7 +704,11 @@ midori_app_init (MidoriApp* app) app->instance = MidoriAppInstanceNull; - midori_app_init_libnotify (app); + #if HAVE_LIBNOTIFY + notify_init ("midori"); + #endif + + app->program_notify_send = g_find_program_in_path ("notify-send"); } static void @@ -653,17 +727,19 @@ midori_app_finalize (GObject* object) katze_object_assign (app->extensions, NULL); katze_object_assign (app->browsers, NULL); - #if HAVE_UNIQUE + #if HAVE_HILDON + osso_deinitialize (app->instance); + app->instance = NULL; + #elif HAVE_UNIQUE katze_object_assign (app->instance, NULL); #else sock_cleanup (); #endif - if (app->libnotify_module) - { - app->libnotify_funcs.uninit (); - g_module_close (app->libnotify_module); - } + #if HAVE_LIBNOTIFY + if (notify_is_initted ()) + notify_uninit (); + #endif katze_assign (app->program_notify_send, NULL); G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); @@ -794,7 +870,12 @@ midori_app_instance_is_running (MidoriApp* app) if (app->instance == MidoriAppInstanceNull) app->instance = midori_app_create_instance (app, app->name); - #if HAVE_UNIQUE + + #if HAVE_HILDON + /* FIXME: Determine if application is running already */ + if (app->instance) + return FALSE; + #elif HAVE_UNIQUE if (app->instance) return unique_app_is_running (app->instance); #else @@ -824,7 +905,9 @@ midori_app_instance_send_activate (MidoriApp* app) /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); - #if HAVE_UNIQUE + #if HAVE_HILDON + osso_application_top (app->instance, PACKAGE_NAME, NULL); + #elif HAVE_UNIQUE if (app->instance) { response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL); @@ -860,7 +943,9 @@ midori_app_instance_send_new_browser (MidoriApp* app) /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); - #if HAVE_UNIQUE + #if HAVE_HILDON + osso_application_top (app->instance, PACKAGE_NAME, "new"); + #elif HAVE_UNIQUE if (app->instance) { response = unique_app_send_message (app->instance, UNIQUE_NEW, NULL); @@ -902,7 +987,9 @@ midori_app_instance_send_uris (MidoriApp* app, g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); g_return_val_if_fail (uris != NULL, FALSE); - #if HAVE_UNIQUE + #if HAVE_HILDON + /* FIXME: Implement */ + #elif HAVE_UNIQUE if (app->instance) { message = unique_message_data_new (); @@ -952,7 +1039,9 @@ midori_app_send_command (MidoriApp* app, if (!midori_app_instance_is_running (app)) return midori_app_command_received (app, "command", command, NULL); - #if HAVE_UNIQUE + #if HAVE_HILDON + /* FIXME: Implement */ + #elif HAVE_UNIQUE if (app->instance) { message = unique_message_data_new (); @@ -1003,6 +1092,9 @@ midori_app_add_browser (MidoriApp* app, * Creates a #MidoriBrowser which inherits its settings, * bookmarks, trash, search engines and history from @app. * + * Note that creating a browser this way can be a lot + * faster than setting it up manually. + * * Return value: a new #MidoriBrowser * * Since: 0.1.2 @@ -1037,52 +1129,16 @@ midori_app_quit (MidoriApp* app) g_signal_emit (app, signals[QUIT], 0); } -static void -midori_app_init_libnotify (MidoriApp* app) -{ - gint i; - const gchar* sonames[] = { "libnotify.so", "libnotify.so.1", NULL }; - - for (i = 0; sonames[i] != NULL && app->libnotify_module == NULL; i++ ) - { - app->libnotify_module = g_module_open (sonames[i], G_MODULE_BIND_LOCAL); - } - - if (app->libnotify_module != NULL) - { - g_module_symbol (app->libnotify_module, "notify_init", - (void*) &(app->libnotify_funcs.init)); - g_module_symbol (app->libnotify_module, "notify_uninit", - (void*) &(app->libnotify_funcs.uninit)); - g_module_symbol (app->libnotify_module, "notify_notification_new", - (void*) &(app->libnotify_funcs.notification_new)); - g_module_symbol (app->libnotify_module, "notify_notification_show", - (void*) &(app->libnotify_funcs.notification_show)); - - /* init libnotify */ - if (!app->libnotify_funcs.init || !app->libnotify_funcs.init ("midori")) - { - g_module_close (app->libnotify_module); - app->libnotify_module = NULL; - } - } - - app->program_notify_send = g_find_program_in_path ("notify-send"); -} - /** * midori_app_send_notification: * @app: a #MidoriApp * @title: title of the notification * @message: text of the notification, or NULL * - * Send #message to the notification daemon to display it. - * This is done by using libnotify if available or by using the program - * "notify-send" as a fallback. + * Send #message to a notification service to display it. * - * There is no guarantee that the message have been sent and displayed, as - * neither libnotify nor "notify-send" might be available or the - * notification daemon might not be running. + * There is no guarantee that the message has been sent and displayed, as + * there might not be any notification service available. * * Since 0.1.7 **/ @@ -1091,19 +1147,26 @@ midori_app_send_notification (MidoriApp* app, const gchar* title, const gchar* message) { - gboolean sent = FALSE; - g_return_if_fail (MIDORI_IS_APP (app)); g_return_if_fail (title); - if (app->libnotify_module) + #if HAVE_HILDON + hildon_banner_show_information_with_markup (GTK_WIDGET (app->browser), + "midori", message); + #else + gboolean sent = FALSE; + + #if HAVE_LIBNOTIFY + if (notify_is_initted ()) { - NotifyNotification* n; + NotifyNotification* note; - n = app->libnotify_funcs.notification_new (title, message, "midori", NULL); - sent = app->libnotify_funcs.notification_show (n, NULL); - g_object_unref (n); + note = notify_notification_new (title, message, "midori", NULL); + sent = notify_notification_show (note, NULL); + g_object_unref (note); } + #endif + /* Fall back to the command line program "notify-send" */ if (!sent && app->program_notify_send) { @@ -1118,4 +1181,5 @@ midori_app_send_notification (MidoriApp* app, g_free (msgq); g_free (command); } + #endif } diff --git a/midori/midori-array.c b/midori/midori-array.c index 7004bea1..1adfd2bf 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -15,6 +15,7 @@ #include #endif +#include #include #if HAVE_LIBXML @@ -22,6 +23,8 @@ #include #endif +#define katze_str_equal(str1, str2) !strcmp (str1, str2) + static void katze_xbel_parse_info (KatzeItem* item, xmlNodePtr cur); @@ -34,29 +37,18 @@ static KatzeItem* katze_item_from_xmlNodePtr (xmlNodePtr cur) { KatzeItem* item; - xmlChar* key; item = katze_item_new (); - key = xmlGetProp (cur, (xmlChar*)"href"); - katze_item_set_uri (item, (gchar*)key); - g_free (key); + item->uri = (gchar*)xmlGetProp (cur, (xmlChar*)"href"); cur = cur->xmlChildrenNode; while (cur) { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - key = xmlNodeGetContent (cur); - katze_item_set_name (item, g_strstrip ((gchar*)key)); - g_free (key); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - key = xmlNodeGetContent (cur); - katze_item_set_text (item, g_strstrip ((gchar*)key)); - g_free (key); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + if (katze_str_equal ((gchar*)cur->name, "title")) + item->name = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + else if (katze_str_equal ((gchar*)cur->name, "desc")) + item->text = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + else if (katze_str_equal ((gchar*)cur->name, "info")) katze_xbel_parse_info (item, cur); cur = cur->next; } @@ -88,27 +80,23 @@ katze_array_from_xmlNodePtr (xmlNodePtr cur) cur = cur->xmlChildrenNode; while (cur) { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - key = xmlNodeGetContent (cur); - katze_item_set_name (KATZE_ITEM (array), g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - key = xmlNodeGetContent (cur); - katze_item_set_text (KATZE_ITEM (array), g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + if (katze_str_equal ((gchar*)cur->name, "title")) + ((KatzeItem*)array)->name = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + else if (katze_str_equal ((gchar*)cur->name, "desc")) + ((KatzeItem*)array)->text = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + else if (katze_str_equal ((gchar*)cur->name, "info")) + katze_xbel_parse_info ((KatzeItem*)array, cur); + else if (katze_str_equal ((gchar*)cur->name, "folder")) { item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); katze_array_add_item (array, item); } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + else if (katze_str_equal ((gchar*)cur->name, "bookmark")) { item = katze_item_from_xmlNodePtr (cur); katze_array_add_item (array, item); } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + else if (katze_str_equal ((gchar*)cur->name, "separator")) { item = katze_item_new (); katze_array_add_item (array, item); @@ -125,22 +113,29 @@ katze_xbel_parse_info (KatzeItem* item, cur = cur->xmlChildrenNode; while (cur) { - if (!xmlStrcmp (cur->name, (const xmlChar*)"metadata")) + if (katze_str_equal ((gchar*)cur->name, "metadata")) { xmlChar* owner = xmlGetProp (cur, (xmlChar*)"owner"); - g_strstrip ((gchar*)owner); + if (owner) + g_strstrip ((gchar*)owner); + else + /* Albeit required, "owner" is not set by MicroB */ + owner = (xmlChar*)NULL; /* FIXME: Save metadata from unknown owners */ - if (!g_strcmp0 ((gchar*)owner, "http://www.twotoasts.de")) + if (!owner || katze_str_equal ((gchar*)owner, "http://www.twotoasts.de")) { xmlAttrPtr properties = cur->properties; + xmlNodePtr children = cur->children; while (properties) { - if (!xmlStrcmp (properties->name, (xmlChar*)"owner")) + xmlChar* value; + + if (katze_str_equal ((gchar*)properties->name, "owner")) { properties = properties->next; continue; } - xmlChar* value = xmlGetProp (cur, properties->name); + value = xmlGetProp (cur, properties->name); if (properties->ns && properties->ns->prefix) { gchar* ns_value = g_strdup_printf ("%s:%s", @@ -155,10 +150,30 @@ katze_xbel_parse_info (KatzeItem* item, xmlFree (value); properties = properties->next; } + while (children) + { + xmlNodePtr grand_children = children->children; + while (grand_children) + { + xmlChar* value = grand_children->content; + gchar* ns_value; + if (!owner) + ns_value = g_strdup_printf (":%s", children->name); + else if (katze_str_equal ((gchar*)owner, "http://www.twotoasts.de")) + ns_value = g_strdup_printf ("midori:%s", children->name); + else /* FIXME: Save metadata from unknown owners */ + ns_value = g_strdup_printf (":%s", children->name); + katze_item_set_meta_string (item, ns_value, (gchar*)value); + g_free (ns_value); + grand_children = grand_children->next; + } + + children = children->next; + } } xmlFree (owner); } - else if (g_strcmp0 ((gchar*)cur->name, "text")) + else if (!katze_str_equal ((gchar*)cur->name, "text")) g_critical ("Unexpected element <%s> in .", cur->name); cur = cur->next; } @@ -170,46 +185,102 @@ katze_array_from_xmlDocPtr (KatzeArray* array, xmlDocPtr doc) { xmlNodePtr cur; - xmlChar* version; - gchar* value; KatzeItem* item; cur = xmlDocGetRootElement (doc); - version = xmlGetProp (cur, (xmlChar*)"version"); - if (xmlStrcmp (version, (xmlChar*)"1.0")) - g_warning ("XBEL version is not 1.0."); - xmlFree (version); - - value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); - katze_item_set_name (KATZE_ITEM (array), value); - g_free (value); - - value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); - katze_item_set_text (KATZE_ITEM (array), value); - g_free (value); if ((cur = xmlDocGetRootElement (doc)) == NULL) { /* Empty document */ return FALSE; } - if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) + if (katze_str_equal ((gchar*)cur->name, "xbel")) + { + /* XBEL 1.0 */ + gchar* value; + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"version"); + if (!katze_str_equal (value, "1.0")) + g_warning ("XBEL version is not 1.0."); + g_free (value); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); + katze_item_set_name (KATZE_ITEM (array), value); + g_free (value); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); + katze_item_set_text (KATZE_ITEM (array), value); + g_free (value); + } + else if (katze_str_equal ((gchar*)cur->name, "RDF")) + { + /* Minimal RSS 1.0 support, enough to read bookmarks */ + cur = cur->xmlChildrenNode; + while (cur) + { + item = NULL; + if (katze_str_equal ((gchar*)cur->name, "item")) + { + xmlNodePtr cur_item; + + item = katze_item_new (); + + cur_item = cur->xmlChildrenNode; + while (cur_item) + { + if (katze_str_equal ((gchar*)cur_item->name, "title")) + item->name = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + else if (katze_str_equal ((gchar*)cur_item->name, "link")) + item->uri = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + else if (katze_str_equal ((gchar*)cur_item->name, "subject")) + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + /* FIXME: Create a folder according to the tag */ + g_free (value); + } + cur_item = cur_item->next; + } + } + else if (katze_str_equal ((gchar*)cur->name, "channel")) + /* Ignored */; + else if (!katze_str_equal ((gchar*)cur->name, "text")) + g_warning ("Unexpected attribute: %s", (gchar*)cur->name); + if (item) + katze_array_add_item (array, item); + cur = cur->next; + } + return TRUE; + } + else { /* Wrong document kind */ return FALSE; } + cur = cur->xmlChildrenNode; while (cur) { item = NULL; - if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + if (katze_str_equal ((gchar*)cur->name, "folder")) item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + else if (katze_str_equal ((gchar*)cur->name, "bookmark")) item = katze_item_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + else if (katze_str_equal ((gchar*)cur->name, "separator")) item = katze_item_new (); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + else if (katze_str_equal ((gchar*)cur->name, "info")) katze_xbel_parse_info (KATZE_ITEM (array), cur); + else if (katze_str_equal ((gchar*)cur->name, "title")) + { + xmlNodePtr node = cur->xmlChildrenNode; + katze_item_set_name (KATZE_ITEM (array), (gchar*)node->content); + } + else if (katze_str_equal ((gchar*)cur->name, "desc")) + { + xmlNodePtr node = cur->xmlChildrenNode; + katze_item_set_text (KATZE_ITEM (array), (gchar*)node->content); + } + else if (!katze_str_equal ((gchar*)cur->name, "text")) + g_warning ("Unexpected attribute: %s", (gchar*)cur->name); if (item) katze_array_add_item (array, item); cur = cur->next; @@ -217,15 +288,120 @@ katze_array_from_xmlDocPtr (KatzeArray* array, return TRUE; } +static gboolean +katze_array_from_opera_file (KatzeArray* array, + FILE* file) +{ + gchar line[200]; + gchar* partial_line = NULL; + KatzeArray* folder = array; + KatzeItem* item = NULL; + + while (fgets (line, 200, file)) + { + gboolean incomplete_line = (strlen (line) == 199); + g_strstrip (line); + if (line[0] == '\0') + { + item = NULL; + continue; + } + else if (line[0] == '-') + { + item = NULL; + if (folder != array) + folder = katze_item_get_parent ((KatzeItem*)folder); + else + g_warning ("A level-up although we are at the top level"); + continue; + } + + if (line[0] == '#') + { + const gchar* element = &line[1]; + if (!g_ascii_strncasecmp (element, "FOLDER", 6)) + { + item = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY); + katze_array_add_item (folder, item); + folder = (KatzeArray*)item; + } + else if (!g_ascii_strncasecmp (element, "URL", 3)) + { + item = katze_item_new (); + katze_array_add_item (folder, item); + } + else + g_warning ("Unexpected element: %s", element); + } + else if (item) + { + gchar** parts; + + /* Handle lines longer than 200 characters */ + if (incomplete_line) + { + if (partial_line) + { + gchar* chunk = g_strconcat (partial_line, line, NULL); + katze_assign (partial_line, chunk); + } + else + partial_line = g_strdup (line); + continue; + } + + if (partial_line) + { + gchar* full_line = g_strconcat (partial_line, line, NULL); + katze_assign (partial_line, NULL); + parts = g_strsplit (full_line, "=", 2); + g_free (full_line); + } + else + parts = g_strsplit (line, "=", 2); + + if (parts && parts[0] && parts[1]) + { + if (katze_str_equal (parts[0], "NAME")) + item->name = g_strdup (parts[1]); + else if (katze_str_equal (parts[0], "URL")) + item->uri = g_strdup (parts[1]); + else if (katze_str_equal (parts[0], "DESCRIPTION")) + item->text = g_strdup (parts[1]); + else if (katze_str_equal (parts[0], "CREATED")) + item->added = g_ascii_strtoull (parts[1], NULL, 10); + /* FIXME: Implement visited time + else if (katze_str_equal (parts[0], "VISITED")) + item->visited = g_ascii_strtoull (parts[1], NULL, 10); */ + else if (katze_str_equal (parts[0], "ON PERSONALBAR")) + katze_item_set_meta_integer (item, "toolbar", + katze_str_equal (parts[1], "YES") ? 1 : -1); + /* FIXME: Implement websites as panels + else if (katze_str_equal (parts[0], "IN PANEL")) + ; */ + } + else + g_warning ("Broken property: %s", line); + g_strfreev (parts); + } + else + g_warning ("Unexpected property outside of element: %s", line); + } + return TRUE; +} + /** * midori_array_from_file: * @array: a #KatzeArray * @filename: a filename to load from - * @format: the desired format + * @format: "xbel", "opera", or %NULL * @error: a #GError or %NULL * * Loads the contents of a file in the specified format. * + * Since 0.2.2 @format can be %NULL to indicate that the + * file should be loaded if it's any supported format. + * * Return value: %TRUE on success, %FALSE otherwise * * Since: 0.1.6 @@ -236,11 +412,8 @@ midori_array_from_file (KatzeArray* array, const gchar* format, GError** error) { - xmlDocPtr doc; - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); g_return_val_if_fail (filename != NULL, FALSE); - g_return_val_if_fail (!g_strcmp0 (format, "xbel"), FALSE); g_return_val_if_fail (!error || !*error, FALSE); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) @@ -252,97 +425,191 @@ midori_array_from_file (KatzeArray* array, return FALSE; } - if ((doc = xmlParseFile (filename)) == NULL) + if (!format) + format = ""; + + /* Opera6 */ + if (katze_str_equal (format, "opera") + || (!*format && g_str_has_suffix (filename, ".adr"))) { - /* No valid xml or broken encoding */ - if (error) - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; + FILE* file; + if ((file = g_fopen (filename, "r"))) + { + guint verify; + gchar line[50]; + + verify = 0; + while (fgets (line, 50, file)) + { + g_strstrip (line); + if (verify == 0 && katze_str_equal (line, "Opera Hotlist version 2.0")) + verify++; + else if (verify == 1 + && katze_str_equal (line, "Options: encoding = utf8, version=3")) + verify++; + else if (verify == 2) + { + if (!katze_array_from_opera_file (array, file)) + { + /* Parsing failed */ + fclose (file); + if (error) + *error = g_error_new_literal (G_FILE_ERROR, + G_FILE_ERROR_FAILED, _("Malformed document.")); + return FALSE; + } + return TRUE; + } + else + break; + } + fclose (file); + } } - if (!katze_array_from_xmlDocPtr (array, doc)) + /* XBEL */ + if (katze_str_equal (format, "xbel") + || !*format) { - /* Parsing failed */ + xmlDocPtr doc; + + if ((doc = xmlParseFile (filename)) == NULL) + { + /* No valid xml or broken encoding */ + if (error) + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + + if (!katze_array_from_xmlDocPtr (array, doc)) + { + /* Parsing failed */ + xmlFreeDoc (doc); + if (error) + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } xmlFreeDoc (doc); - if (error) - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; + return TRUE; } - xmlFreeDoc (doc); - return TRUE; + + if (error) + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Unrecognized bookmark format.")); + return FALSE; } #endif -static gchar* -_simple_xml_element (const gchar* name, - const gchar* value) +/* Inspired by append_escaped_text() from gmarkup.c in Glib. + The main difference is that we filter out control characters. */ +static void +string_append_escaped (GString *str, + const gchar *text) { - gchar* value_escaped; - gchar* markup; + gssize length; + const gchar* p; + const gchar* end; + gunichar c; - if (!value) - return g_strdup (""); - value_escaped = g_markup_escape_text (value, -1); - markup = g_strdup_printf ("<%s>%s\n", name, value_escaped, name); - g_free (value_escaped); - return markup; + length = strlen (text); + p = text; + end = text + length; + + while (p != end) + { + const gchar *next; + next = g_utf8_next_char (p); + + switch (*p) + { + case '&': + g_string_append (str, "&"); + break; + case '<': + g_string_append (str, "<"); + break; + case '>': + g_string_append (str, ">"); + break; + case '\'': + g_string_append (str, "'"); + break; + case '"': + g_string_append (str, """); + break; + default: + c = g_utf8_get_char (p); + if (g_unichar_iscntrl (c)) + g_string_append_c (str, ' '); + else if ((0x1 <= c && c <= 0x8) + || (0xb <= c && c <= 0xc) + || (0xe <= c && c <= 0x1f) + || (0x7f <= c && c <= 0x84) + || (0x86 <= c && c <= 0x9f)) + g_string_append_printf (str, "&#x%x;", c); + else + g_string_append_len (str, p, next - p); + break; + } + + p = next; + } } -static gchar* -katze_item_to_data (KatzeItem* item) +static void +string_append_xml_element (GString* string, + const gchar* name, + const gchar* value) +{ + if (value) + { + g_string_append_printf (string, "<%s>", name); + string_append_escaped (string, value); + g_string_append_printf (string, "\n", name); + } +} + +static void +string_append_item (GString* string, + KatzeItem* item) { gchar* markup; gchar* metadata; - g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + g_return_if_fail (KATZE_IS_ITEM (item)); markup = NULL; metadata = katze_item_metadata_to_xbel (item); if (KATZE_IS_ARRAY (item)) { - GString* _markup = g_string_new (NULL); guint i = 0; KatzeItem* _item; - while ((_item = katze_array_get_nth_item (KATZE_ARRAY (item), i++))) - { - gchar* item_markup = katze_item_to_data (_item); - g_string_append (_markup, item_markup); - g_free (item_markup); - } - /* gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); */ - gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); - gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); - markup = g_strdup_printf ("\n%s%s%s%s\n", - "" /* folded ? folded : "" */, - title, desc, - _markup->str, - metadata); - g_string_free (_markup, TRUE); - /* g_free (folded); */ - g_free (title); - g_free (desc); + KatzeArray* array = KATZE_ARRAY (item); + + g_string_append (string, "\n"); + /* FIXME: " folded=\"no\" */ + string_append_xml_element (string, "title", katze_item_get_name (item)); + string_append_xml_element (string, "desc", katze_item_get_text (item)); + while ((_item = katze_array_get_nth_item (array, i++))) + string_append_item (string, _item); + g_string_append (string, metadata); + g_string_append (string, "\n"); } else if (katze_item_get_uri (item)) { - gchar* href_escaped = g_markup_escape_text (katze_item_get_uri (item), -1); - gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); - g_free (href_escaped); - gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); - gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); - markup = g_strdup_printf ("\n%s%s%s\n", - href, - title, desc, - metadata); - g_free (href); - g_free (title); - g_free (desc); + g_string_append (string, "\n"); + string_append_xml_element (string, "title", katze_item_get_name (item)); + string_append_xml_element (string, "desc", katze_item_get_text (item)); + g_string_append (string, metadata); + g_string_append (string, "\n"); } else - markup = g_strdup ("\n"); + g_string_append (string, "\n"); g_free (metadata); - return markup; } static gchar* @@ -350,28 +617,55 @@ katze_item_metadata_to_xbel (KatzeItem* item) { GList* keys = katze_item_get_meta_keys (item); GString* markup; - /* FIXME: Allow specifying an alternative namespace/ URI */ - const gchar* namespace_uri = "http://www.twotoasts.de"; - const gchar* namespace = "midori"; + GString* markdown; + /* FIXME: Allow specifying an alternative default namespace */ + /* FIXME: Support foreign namespaces with their own URI */ + gchar* namespace = NULL; + const gchar* namespace_uri; gsize i; const gchar* key; + const gchar* value; if (!keys) return g_strdup (""); - markup = g_string_new ("\n\n", key); + string_append_escaped (markdown, value); + g_string_append_printf (markdown, "\n", key); + } + else if (namespace) + { + g_string_append_printf (markup, " %s=\"", key); + string_append_escaped (markup, value); + g_string_append_c (markup, '\"'); + } + else + { + g_string_append_printf (markup, " midori:%s=\"", key); + string_append_escaped (markup, value); + g_string_append_c (markup, '\"'); + } } - g_string_append_printf (markup, "/>\n\n"); + if (!namespace) + { + namespace_uri = "http://www.twotoasts.de"; + g_string_append_printf (markup, " owner=\"%s\"", namespace_uri); + } + if (markdown->len) + g_string_append_printf (markup, ">\n%s\n\n", markdown->str); + else + g_string_append_printf (markup, "/>\n\n"); + g_string_free (markdown, TRUE); return g_string_free (markup, FALSE); } @@ -379,46 +673,29 @@ static gchar* katze_array_to_xbel (KatzeArray* array, GError** error) { - GString* inner_markup; + gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array)); guint i; KatzeItem* item; - gchar* item_xml; - const gchar* namespacing; - gchar* title; - gchar* desc; - gchar* metadata; - gchar* outer_markup; - inner_markup = g_string_new (NULL); + GString* markup = g_string_new ( + "\n" + "\n" + "\n"); + string_append_xml_element (markup, "title", katze_item_get_name (KATZE_ITEM (array))); + string_append_xml_element (markup, "desc", katze_item_get_text (KATZE_ITEM (array))); + g_string_append (markup, metadata); i = 0; while ((item = katze_array_get_nth_item (array, i++))) - { - item_xml = katze_item_to_data (item); - g_string_append (inner_markup, item_xml); - g_free (item_xml); - } + string_append_item (markup, item); + g_string_append (markup, "\n"); - namespacing = " xmlns:midori=\"http://www.twotoasts.de\""; - title = _simple_xml_element ("title", katze_item_get_name (KATZE_ITEM (array))); - desc = _simple_xml_element ("desc", katze_item_get_text (KATZE_ITEM (array))); - metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array)); - outer_markup = g_strdup_printf ( - "%s%s\n%s%s%s%s\n", - "\n", - "\n", - namespacing, - title, - desc, - metadata, - inner_markup->str); - g_string_free (inner_markup, TRUE); - g_free (title); - g_free (desc); g_free (metadata); - return outer_markup; + return g_string_free (markup, FALSE); } static gboolean diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 03ffd135..5e72aec7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -17,6 +17,7 @@ #include "midori-browser.h" +#include "midori-array.h" #include "midori-view.h" #include "midori-preferences.h" #include "midori-panel.h" @@ -37,6 +38,18 @@ #include #endif +#ifdef HAVE_HILDON_2_2 + #include + #include + #include + #define MCE_SIGNAL_MATCH "type='signal'," \ + "sender='" MCE_SERVICE "'," \ + "path='" MCE_SIGNAL_PATH "'," \ + "interface='" MCE_SIGNAL_IF "'" + #include + #include +#endif + struct _MidoriBrowser { #if HAVE_HILDON @@ -67,6 +80,7 @@ struct _MidoriBrowser gboolean find_typing; GtkWidget* statusbar; + GtkWidget* statusbar_contents; GtkWidget* transferbar; GtkWidget* transferbar_clear; GtkWidget* progressbar; @@ -91,7 +105,7 @@ struct _MidoriBrowser gboolean show_statusbar; gboolean speed_dial_in_new_tabs; gboolean progress_in_location; - gboolean remember_last_visited_pages; + guint maximum_history_age; gchar* location_entry_search; gchar* news_aggregator; }; @@ -198,6 +212,14 @@ _action_set_sensitive (MidoriBrowser* browser, gtk_action_set_sensitive (_action_by_name (browser, name), sensitive); } +static void +_action_set_visible (MidoriBrowser* browser, + const gchar* name, + gboolean visible) +{ + gtk_action_set_visible (_action_by_name (browser, name), visible); +} + static void _action_set_active (MidoriBrowser* browser, const gchar* name, @@ -217,7 +239,7 @@ _toggle_tabbar_smartly (MidoriBrowser* browser) return; n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - if (n < 2 && browser->settings) + if (n < 2) { g_object_get (browser->settings, "always-show-tabbar", &always_show_tabbar, NULL); @@ -236,7 +258,6 @@ _midori_browser_update_actions (MidoriBrowser* browser) _toggle_tabbar_smartly (browser); n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - _action_set_sensitive (browser, "TabClose", n > 1); _action_set_sensitive (browser, "TabPrevious", n > 1); _action_set_sensitive (browser, "TabNext", n > 1); @@ -273,7 +294,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; can_reload = midori_view_can_reload (view); - _action_set_sensitive (browser, "Reload", can_reload && !loading); + _action_set_sensitive (browser, "Reload", can_reload); _action_set_sensitive (browser, "Stop", can_reload && loading); _action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view)); @@ -345,17 +366,13 @@ _midori_browser_update_interface (MidoriBrowser* browser) { midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); - #if HAVE_HILDON gtk_action_set_sensitive (_action_by_name (browser, "AddNewsFeed"), TRUE); - #endif } else { midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); - #if HAVE_HILDON gtk_action_set_sensitive (_action_by_name (browser, "AddNewsFeed"), FALSE); - #endif } } @@ -467,7 +484,7 @@ midori_view_notify_icon_cb (MidoriView* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (browser->remember_last_visited_pages) + if (browser->maximum_history_age) midori_location_action_set_icon_for_uri ( MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); } @@ -486,7 +503,7 @@ midori_view_notify_load_status_cb (GtkWidget* widget, if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { - if (browser->remember_last_visited_pages) + if (browser->maximum_history_age) midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); } @@ -558,7 +575,7 @@ midori_view_notify_title_cb (GtkWidget* widget, uri = midori_view_get_display_uri (view); title = midori_view_get_display_title (view); action = _action_by_name (browser, "Location"); - if (browser->remember_last_visited_pages) + if (browser->maximum_history_age) midori_location_action_set_title_for_uri ( MIDORI_LOCATION_ACTION (action), title, uri); if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) @@ -566,7 +583,7 @@ midori_view_notify_title_cb (GtkWidget* widget, KatzeItem* item; KatzeItem* proxy; - if (browser->history && browser->remember_last_visited_pages) + if (browser->history && browser->maximum_history_age) { item = g_object_get_data (G_OBJECT (view), "history-item-added"); proxy = midori_view_get_proxy_item (view); @@ -625,7 +642,9 @@ midori_browser_edit_bookmark_uri_changed_cb (GtkEntry* entry, gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT, uri && (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://") - || g_str_has_prefix (uri, "file://"))); + || g_str_has_prefix (uri, "file://") + || g_str_has_prefix (uri, "data:") + || g_str_has_prefix (uri, "javascript:"))); } /* Private function, used by MidoriBookmarks and MidoriHistory */ @@ -646,6 +665,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* entry_desc; GtkWidget* entry_uri; GtkWidget* combo_folder; + GtkWidget* check_toolbar; + GtkWidget* check_app; if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser)) return; @@ -682,7 +703,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); label = gtk_label_new_with_mnemonic (_("_Title:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -695,7 +716,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); label = gtk_label_new_with_mnemonic (_("_Description:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -714,11 +735,16 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (!KATZE_IS_ARRAY (bookmark)) { hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); label = gtk_label_new_with_mnemonic (_("_Address:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); + #if HAVE_HILDON + HildonGtkInputMode mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry_uri)); + mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP; + hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_uri), mode); + #endif gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark)); midori_browser_edit_bookmark_uri_changed_cb (GTK_ENTRY (entry_uri), @@ -733,39 +759,75 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, combo_folder = NULL; if (1) { + GtkListStore* model; + GtkCellRenderer* renderer; KatzeItem* item; guint i, n; hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); label = gtk_label_new_with_mnemonic (_("_Folder:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - combo_folder = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), - _("Toplevel folder")); + model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); + combo_folder = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model)); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_folder), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder), renderer, "text", 0); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder), renderer, "ellipsize", 1); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); i = 0; n = 1; while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) { - if (KATZE_IS_ARRAY (item)) + if (KATZE_IS_ARRAY (item) && item != bookmark) { const gchar* name = katze_item_get_name (item); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), name); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, name, 1, PANGO_ELLIPSIZE_END, -1); if (katze_item_get_parent (bookmark) == item) gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); n++; } } - if (!i) + if (n < 2) gtk_widget_set_sensitive (combo_folder, FALSE); gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); } + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); + label = gtk_label_new (NULL); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar), + katze_item_get_meta_string (bookmark, "toolbar") != NULL); + gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + check_app = NULL; + if (!KATZE_IS_ARRAY (bookmark)) + { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); + label = gtk_label_new (NULL); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app), + katze_item_get_meta_string (bookmark, "app") != NULL); + gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + } + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { @@ -776,31 +838,40 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_title))); katze_item_set_text (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_desc))); + katze_item_set_meta_integer (bookmark, "toolbar", + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)) + ? 1 : -1); if (!KATZE_IS_ARRAY (bookmark)) + { katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); + katze_item_set_meta_integer (bookmark, "app", + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app)) + ? 1 : -1); + } folder = browser->bookmarks; - if (1) + selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); + if (strcmp (selected, _("Toplevel folder"))) { - selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - if (g_strcmp0 (selected, _("Toplevel folder"))) - { - guint i = 0; - KatzeItem* item; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - if (KATZE_IS_ARRAY (item)) - if (!g_strcmp0 (katze_item_get_name (item), selected)) - { - folder = KATZE_ARRAY (item); - break; - } - } - g_free (selected); - if (!new_bookmark) - katze_array_remove_item (katze_item_get_parent (bookmark), bookmark); - katze_array_add_item (folder, bookmark); + guint i = 0; + KatzeItem* item; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) + if (KATZE_IS_ARRAY (item)) + if (!g_strcmp0 (katze_item_get_name (item), selected)) + { + folder = KATZE_ARRAY (item); + break; + } + } + g_free (selected); + if (folder != katze_item_get_parent (bookmark) && folder != browser->bookmarks) + { + katze_array_remove_item (katze_item_get_parent (bookmark), bookmark); + new_bookmark = TRUE; } + if (new_bookmark) + katze_array_add_item (folder, bookmark); } gtk_widget_destroy (dialog); } @@ -861,14 +932,8 @@ midori_browser_save_uri (MidoriBrowser* browser, if (!GTK_WIDGET_VISIBLE (browser)) return; - dialog = gtk_file_chooser_dialog_new ( - _("Save file as"), GTK_WINDOW (browser), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + dialog = sokoke_file_chooser_dialog_new (_("Save file as"), + GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); if (uri) { @@ -904,7 +969,7 @@ midori_browser_save_uri (MidoriBrowser* browser, if (!folder_set && last_dir && *last_dir) gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { #if WEBKIT_CHECK_VERSION (1, 1, 3) WebKitNetworkRequest* request; @@ -994,11 +1059,6 @@ midori_browser_speed_dial_get_next_free_slot (void) return slot_id; } -GdkPixbuf* -midori_view_get_snapshot (MidoriView* view, - guint width, - guint height); - static void midori_browser_add_speed_dial (MidoriBrowser* browser) { @@ -1196,8 +1256,8 @@ midori_view_new_window_cb (GtkWidget* view, const gchar* uri, MidoriBrowser* browser) { - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); - g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); midori_browser_add_uri (new_browser, uri); } @@ -1210,12 +1270,12 @@ midori_view_new_view_cb (GtkWidget* view, midori_browser_view_copy_history (new_view, view, TRUE); if (where == MIDORI_NEW_VIEW_WINDOW) { - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); - g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); midori_browser_add_tab (new_browser, new_view); midori_browser_set_current_tab (new_browser, new_view); } - else + else if (gtk_widget_get_parent (new_view) != browser->notebook) { gint n = midori_browser_add_tab (browser, new_view); if (where != MIDORI_NEW_VIEW_BACKGROUND) @@ -1269,8 +1329,7 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), "done", (void*)1); - if (browser->settings && katze_object_get_boolean ( - browser->settings, "notify-transfer-completed")) + if (katze_object_get_boolean (browser->settings, "notify-transfer-completed")) { const gchar* uri = webkit_download_get_destination_uri (download); gchar* path = soup_uri_decode (uri); @@ -1392,7 +1451,7 @@ midori_view_download_save_as_response_cb (GtkWidget* dialog, MidoriBrowser* browser) { WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download"); - if (response == GTK_RESPONSE_ACCEPT) + if (response == GTK_RESPONSE_OK) { gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); webkit_download_set_destination_uri (download, uri); @@ -1420,14 +1479,8 @@ midori_view_download_requested_cb (GtkWidget* view, if (!dialog) { - dialog = gtk_file_chooser_dialog_new ( - _("Save file"), GTK_WINDOW (browser), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + dialog = sokoke_file_chooser_dialog_new (_("Save file"), + GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); folder = katze_object_get_string (browser->settings, "download-folder"); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder); @@ -1512,8 +1565,10 @@ midori_view_search_text_cb (GtkWidget* view, } if (GTK_WIDGET_VISIBLE (browser->find) && !typing) { + #if !HAVE_HILDON gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); + #endif text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); case_sensitive = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); @@ -1622,7 +1677,6 @@ _midori_browser_add_tab (MidoriBrowser* browser, NULL); if (!g_object_get_data (G_OBJECT (view), "midori-view-append") && - browser->settings && katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { n = gtk_notebook_get_current_page (notebook); @@ -1676,20 +1730,50 @@ _midori_browser_quit (MidoriBrowser* browser) /* Nothing to do */ } +static gboolean +midori_browser_key_press_event (GtkWidget* widget, + GdkEventKey* event) +{ + GtkWindow* window = GTK_WINDOW (widget); + GtkWidgetClass* widget_class; + + if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) + if (sokoke_window_activate_key (window, event)) + return TRUE; + + if (gtk_window_propagate_key_event (window, event)) + return TRUE; + + if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) + if (sokoke_window_activate_key (window, event)) + return TRUE; + + if (event->state && gtk_window_propagate_key_event (window, event)) + return TRUE; + + widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW)); + return widget_class->key_press_event (widget, event); +} + static void midori_browser_class_init (MidoriBrowserClass* class) { + GtkWidgetClass* gtkwidget_class; GObjectClass* gobject_class; GParamFlags flags; /** * MidoriBrowser::new-window: * @browser: the object on which the signal is emitted - * @window: a new browser window + * @window: a new browser window, or %NULL * * Emitted when a new browser window was created. * * Note: Before 0.1.7 the second argument was an URI string. + * + * Note: Since 0.2.1 the return value is a #MidoriBrowser + * + * Return value: a new #MidoriBrowser */ signals[NEW_WINDOW] = g_signal_new ( "new-window", @@ -1698,8 +1782,8 @@ midori_browser_class_init (MidoriBrowserClass* class) G_STRUCT_OFFSET (MidoriBrowserClass, new_window), 0, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, + midori_cclosure_marshal_OBJECT__OBJECT, + MIDORI_TYPE_BROWSER, 1, MIDORI_TYPE_BROWSER); signals[ADD_TAB] = g_signal_new ( @@ -1832,6 +1916,9 @@ midori_browser_class_init (MidoriBrowserClass* class) class->activate_action = _midori_browser_activate_action; class->quit = _midori_browser_quit; + gtkwidget_class = GTK_WIDGET_CLASS (class); + gtkwidget_class->key_press_event = midori_browser_key_press_event; + gobject_class = G_OBJECT_CLASS (class); gobject_class->dispose = midori_browser_dispose; gobject_class->finalize = midori_browser_finalize; @@ -1904,13 +1991,19 @@ midori_browser_class_init (MidoriBrowserClass* class) MIDORI_LOAD_FINISHED, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * MidoriBrowser:statusbar: + * + * The widget representing the statusbar contents. This is + * not an actual #GtkStatusbar but rather a #GtkBox. + */ g_object_class_install_property (gobject_class, PROP_STATUSBAR, g_param_spec_object ( "statusbar", "Statusbar", "The statusbar", - GTK_TYPE_STATUSBAR, + GTK_TYPE_BOX, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** @@ -2055,10 +2148,13 @@ static void _action_window_new_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); - g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); - midori_browser_add_uri (new_browser, ""); - midori_browser_activate_action (new_browser, "Location"); + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); + if (new_browser) + { + midori_browser_add_uri (new_browser, ""); + midori_browser_activate_action (new_browser, "Location"); + } } static void @@ -2069,6 +2165,16 @@ _action_tab_new_activate (GtkAction* action, midori_browser_set_current_page (browser, n); } +static void +_action_private_browsing_activate (GtkAction* action, + MidoriBrowser* browser) +{ + const gchar* uri = midori_browser_get_current_uri (browser); + if (uri != NULL) + /* FIXME: Use the same binary that is running right now */ + sokoke_spawn_program ("midori -a", uri, FALSE); +} + static void _action_open_activate (GtkAction* action, MidoriBrowser* browser) @@ -2077,21 +2183,16 @@ _action_open_activate (GtkAction* action, gchar* uri = NULL; gboolean folder_set = FALSE; GtkWidget* dialog; + GtkWidget* view; if (!GTK_WIDGET_VISIBLE (browser)) return; - dialog = gtk_file_chooser_dialog_new ( - _("Open file"), GTK_WINDOW (browser), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + dialog = sokoke_file_chooser_dialog_new (_("Open file"), + GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN); /* base the start folder on the current view's uri if it is local */ - GtkWidget* view = midori_browser_get_current_tab (browser); + view = midori_browser_get_current_tab (browser); if ((uri = (gchar*)midori_view_get_display_uri (MIDORI_VIEW (view)))) { gchar* filename = g_filename_from_uri (uri, NULL, NULL); @@ -2112,7 +2213,7 @@ _action_open_activate (GtkAction* action, if (!folder_set && last_dir && *last_dir) gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { gchar* folder; @@ -2156,6 +2257,16 @@ _action_add_desktop_shortcut_activate (GtkAction* action, #endif } +static void +midori_browser_subscribe_to_news_feed (MidoriBrowser* browser, + const gchar* uri) +{ + if (browser->news_aggregator && *browser->news_aggregator) + sokoke_spawn_program (browser->news_aggregator, uri, FALSE); + else + sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), uri); +} + static void _action_add_news_feed_activate (GtkAction* action, MidoriBrowser* browser) @@ -2168,63 +2279,46 @@ _action_add_news_feed_activate (GtkAction* action, if (!(uri = g_object_get_data (G_OBJECT (view), "news-feeds"))) return; - if (browser->news_aggregator && *browser->news_aggregator) - sokoke_spawn_program (browser->news_aggregator, uri, TRUE); - else - { - GtkWidget* dialog = gtk_message_dialog_new ( - GTK_WINDOW (browser), 0, GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, "%s", _("New feed")); - gtk_message_dialog_format_secondary_text ( - GTK_MESSAGE_DIALOG (dialog), "%s", uri); - gtk_widget_show (dialog); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), dialog); - } + midori_browser_subscribe_to_news_feed (browser, uri); } static void _action_compact_add_activate (GtkAction* action, MidoriBrowser* browser) { - GtkStockItem item; GtkWidget* dialog; GtkBox* box; - gchar* label = NULL; - GtkWidget* button; + const gchar* actions[] = { "BookmarkAdd", "AddSpeedDial", + "AddDesktopShortcut", "AddNewsFeed" }; + guint i; if (!GTK_WIDGET_VISIBLE (browser)) return; - gtk_stock_lookup (GTK_STOCK_ADD, &item); dialog = g_object_new (GTK_TYPE_DIALOG, - "transient-for", browser, "title", item.label, NULL); /* Add a new bookmark */ + "transient-for", browser, + "title", _("Add a new bookmark"), NULL); box = GTK_BOX (GTK_DIALOG (dialog)->vbox); - action = _action_by_name (browser, "BookmarkAdd"); - katze_assign (label, katze_object_get_string (action, "label")); - button = gtk_button_new_with_mnemonic (label); - gtk_box_pack_start (box, button, TRUE, TRUE, 4); - gtk_action_connect_proxy (action, button); - action = _action_by_name (browser, "AddSpeedDial"); - katze_assign (label, katze_object_get_string (action, "label")); - button = gtk_button_new_with_mnemonic (label); - gtk_box_pack_start (box, button, TRUE, TRUE, 4); - gtk_action_connect_proxy (action, button); - action = _action_by_name (browser, "AddDesktopShortcut"); - katze_assign (label, katze_object_get_string (action, "label")); - button = gtk_button_new_with_mnemonic (label); - gtk_box_pack_start (box, button, TRUE, TRUE, 4); - gtk_action_connect_proxy (action, button); - action = _action_by_name (browser, "AddNewsFeed"); - katze_assign (label, katze_object_get_string (action, "label")); - button = gtk_button_new_with_mnemonic (label); - gtk_box_pack_start (box, button, TRUE, TRUE, 4); - gtk_action_connect_proxy (action, button); - - g_free (label); - - gtk_dialog_run (GTK_DIALOG (dialog)); + for (i = 0; i < G_N_ELEMENTS (actions); i++) + { + gchar* label; + GtkWidget* button; + + action = _action_by_name (browser, actions[i]); + label = katze_object_get_string (action, "label"); + button = gtk_button_new_with_mnemonic (label); + g_free (label); + gtk_widget_set_name (button, "GtkButton-thumb"); + gtk_box_pack_start (box, button, TRUE, TRUE, 4); + gtk_action_connect_proxy (action, button); + g_signal_connect_swapped (button, "clicked", + G_CALLBACK (gtk_widget_destroy), dialog); + } + + gtk_widget_show (dialog); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); } static void @@ -2410,12 +2504,19 @@ _action_find_activate (GtkAction* action, { if (!GTK_WIDGET_VISIBLE (browser->find)) { + GtkWidget* view; + const gchar* text; + + #if !HAVE_HILDON gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); - gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); gtk_widget_show (GTK_WIDGET (browser->find_case)); + #endif gtk_widget_show (GTK_WIDGET (browser->find_highlight)); gtk_widget_show (GTK_WIDGET (browser->find_close)); + view = midori_browser_get_current_tab (browser); + if ((text = midori_view_get_selected_text (MIDORI_VIEW (view)))) + gtk_entry_set_text (GTK_ENTRY (browser->find_text), text); gtk_widget_show (browser->find); } @@ -2538,7 +2639,6 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser); -#if !HAVE_HILDON static void _midori_browser_save_toolbar_items (MidoriBrowser* browser) { @@ -2563,7 +2663,6 @@ _midori_browser_save_toolbar_items (MidoriBrowser* browser) g_object_set (browser->settings, "toolbar-items", items, NULL); g_free (items); } -#endif /** * midori_browser_get_toolbar_actions: @@ -2582,7 +2681,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) "Fullscreen", "Preferences", "Window", "Bookmarks", "RecentlyVisited", "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", - "Panel", "Trash", "Search", NULL }; + "Panel", "Trash", "Search", "BookmarkAdd", NULL }; return actions; } @@ -2679,7 +2778,8 @@ _action_trash_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); + guint n = midori_browser_add_item (browser, item); + midori_browser_set_current_page (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } @@ -2752,12 +2852,21 @@ _action_bookmarks_populate_popup (GtkAction* action, } g_list_free (children); - if (katze_array_get_nth_item (browser->bookmarks, 0)) + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + + if (katze_array_is_empty (browser->bookmarks)) { - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); } + menuitem = gtk_action_create_menu_item ( + _action_by_name (browser, "BookmarksImport")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "BookmarkFolderAdd")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); @@ -2768,13 +2877,36 @@ _action_bookmarks_populate_popup (GtkAction* action, gtk_widget_show (menuitem); } +/* static */ void +midori_browser_open_bookmark (MidoriBrowser* browser, + KatzeItem* item) +{ + const gchar* uri = katze_item_get_uri (item); + gchar* uri_fixed; + + if (!(uri && *uri)) + return; + + /* Imported bookmarks may lack a protocol */ + uri_fixed = sokoke_magic_uri (uri, NULL); + + /* FIXME: Use the same binary that is running right now */ + if (katze_item_get_meta_integer (item, "app") != -1) + sokoke_spawn_program ("midori -a", uri_fixed, FALSE); + else + { + midori_browser_set_current_uri (browser, uri_fixed); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); + } + g_free (uri_fixed); +} + static void _action_bookmarks_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); - gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); + midori_browser_open_bookmark (browser, item); } static void @@ -2830,6 +2962,12 @@ _action_tools_populate_popup (GtkAction* action, } } +static void +midori_browser_bookmark_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + MidoriBrowser* browser); + static gboolean _action_menus_activate_item_alt (GtkAction* action, KatzeItem* item, @@ -2843,6 +2981,13 @@ _action_menus_activate_item_alt (GtkAction* action, return TRUE; } + else if (button == 3) + { + GdkEvent* event = gtk_get_current_event (); + midori_browser_bookmark_popup (gtk_get_event_widget (event), + (GdkEventButton*)event, item, browser); + return TRUE; + } return FALSE; } @@ -2877,11 +3022,11 @@ _action_window_populate_popup (GtkAction* action, gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "TabPrevious")); + _action_by_name (browser, "TabNext")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "TabNext")); + _action_by_name (browser, "TabPrevious")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); } @@ -2911,37 +3056,35 @@ _action_compact_menu_populate_popup (GtkAction* action, static const GtkActionEntry actions[] = { { "TabNew" }, { "WindowNew" }, + { "PrivateBrowsing" }, { "Open" }, #if HAVE_HILDON { "Find" }, - { "Homepage" }, - { "ManageSearchEngines" }, #else { "Print" }, - { "PrivateBrowsing" }, + { "About" }, { NULL }, + { "Menubar" }, { "Bookmarkbar" }, { "Panel" }, { "Statusbar" }, { NULL }, { "-" }, - #endif { "ClearPrivateData" }, - #if !HAVE_HILDON { "Fullscreen" }, #endif { "Preferences" }, + #if HAVE_HILDON + { "auto-load-images" }, + { "enable-scripts" }, + { "enable-plugins" }, + #endif }; guint i; for (i = 0; i < G_N_ELEMENTS (actions); i++) { - #if HAVE_HILDON - #if HILDON_CHECK_VERSION (2, 2, 0) - #define HAVE_APP_MENU 1 - #endif - #endif - #ifdef HAVE_APP_MENU + #ifdef HAVE_HILDON_2_2 GtkAction* _action; gchar* label; GtkWidget* button; @@ -2949,13 +3092,19 @@ _action_compact_menu_populate_popup (GtkAction* action, if (!actions[i].name) continue; _action = _action_by_name (browser, actions[i].name); - label = katze_object_get_string (_action, "label"); - button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + if (_action) + { + label = katze_object_get_string (_action, "label"); + button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + gtk_button_set_label (GTK_BUTTON (button), label); + gtk_button_set_use_underline (GTK_BUTTON (button), TRUE); + g_free (label); + g_signal_connect_swapped (button, "clicked", + G_CALLBACK (gtk_action_activate), _action); + } + else + button = katze_property_proxy (browser->settings, actions[i].name, NULL); gtk_widget_show (button); - gtk_button_set_label (GTK_BUTTON (button), label); - g_free (label); - g_signal_connect_swapped (button, "clicked", - G_CALLBACK (gtk_action_activate), _action); hildon_app_menu_append (HILDON_APP_MENU (menu), GTK_BUTTON (button)); #else GtkWidget* menuitem; @@ -2970,9 +3119,11 @@ _action_compact_menu_populate_popup (GtkAction* action, _action_by_name (browser, actions[i].name)); } else + { menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + } gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); #endif } } @@ -2992,13 +3143,12 @@ _action_preferences_activate (GtkAction* action, { static GtkWidget* dialog = NULL; - if (!browser->settings || !GTK_WIDGET_VISIBLE (browser)) + if (!GTK_WIDGET_VISIBLE (browser)) return; if (!dialog) { - dialog = midori_preferences_new (GTK_WINDOW (browser), - browser->settings); + dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings); g_signal_connect (dialog, "response", G_CALLBACK (midori_preferences_response_help_cb), browser); g_signal_connect (dialog, "destroy", @@ -3014,49 +3164,45 @@ _action_menubar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-menubar", active, NULL); - #if !HAVE_HILDON - sokoke_widget_set_visible (browser->menubar, active); - if (browser->settings) + if (active) { - if (active) + GtkContainer* navigationbar = GTK_CONTAINER (browser->navigationbar); + GList* children = gtk_container_get_children (navigationbar); + GtkAction* menu_action = _action_by_name (browser, "CompactMenu"); + for (; children != NULL; children = g_list_next (children)) { - GtkContainer* navigationbar = GTK_CONTAINER (browser->navigationbar); - GList* children = gtk_container_get_children (navigationbar); - GtkAction* menu_action = _action_by_name (browser, "CompactMenu"); - for (; children != NULL; children = g_list_next (children)) + GtkAction* action_; + action_ = gtk_widget_get_action (GTK_WIDGET (children->data)); + if (action_ == menu_action) { - GtkAction* action_; - action_ = gtk_widget_get_action (GTK_WIDGET (children->data)); - if (action_ == menu_action) - { - gtk_container_remove (navigationbar, - GTK_WIDGET (children->data)); - _midori_browser_save_toolbar_items (browser); - break; - } + gtk_container_remove (navigationbar, + GTK_WIDGET (children->data)); + _midori_browser_save_toolbar_items (browser); + break; } } - else - { - GtkAction* widget_action = _action_by_name (browser, "CompactMenu"); - GtkWidget* toolitem = gtk_action_create_tool_item (widget_action); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (toolitem), -1); - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), - browser); - _midori_browser_save_toolbar_items (browser); - } + } + else + { + GtkAction* widget_action = _action_by_name (browser, "CompactMenu"); + GtkWidget* toolitem = gtk_action_create_tool_item (widget_action); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), -1); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + _midori_browser_save_toolbar_items (browser); } + g_object_set (browser->settings, "show-menubar", active, NULL); + /* Make sure the menubar is uptodate in case no settings are set */ + sokoke_widget_set_visible (browser->menubar, active); + g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible", GTK_WIDGET_VISIBLE (browser->menubar) || GTK_WIDGET_VISIBLE (browser->navigationbar) ? (void*)0xdeadbeef : NULL); - #endif } static void @@ -3064,8 +3210,7 @@ _action_navigationbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-navigationbar", active, NULL); + g_object_set (browser->settings, "show-navigationbar", active, NULL); sokoke_widget_set_visible (browser->navigationbar, active); g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible", @@ -3079,8 +3224,7 @@ _action_bookmarkbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-bookmarkbar", active, NULL); + g_object_set (browser->settings, "show-bookmarkbar", active, NULL); sokoke_widget_set_visible (browser->bookmarkbar, active); } @@ -3089,8 +3233,7 @@ _action_transferbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-transferbar", active, NULL); + g_object_set (browser->settings, "show-transferbar", active, NULL); sokoke_widget_set_visible (browser->transferbar, active); } @@ -3099,11 +3242,8 @@ _action_statusbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-statusbar", active, NULL); - #if !HAVE_HILDON + g_object_set (browser->settings, "show-statusbar", active, NULL); sokoke_widget_set_visible (browser->statusbar, active); - #endif } static void @@ -3184,6 +3324,8 @@ _action_view_encoding_activate (GtkAction* action, encoding = "BIG5"; else if (!strcmp (name, "EncodingJapanese")) encoding = "SHIFT_JIS"; + else if (!strcmp (name, "EncodingKorean")) + encoding = "EUC-KR"; else if (!strcmp (name, "EncodingRussian")) encoding = "KOI8-R"; else if (!strcmp (name, "EncodingUnicode")) @@ -3294,10 +3436,7 @@ _action_source_view_activate (GtkAction* action, if (!(view = midori_browser_get_current_tab (browser))) return; - if (browser->settings) - g_object_get (browser->settings, "text-editor", &text_editor, NULL); - else - text_editor = NULL; + g_object_get (browser->settings, "text-editor", &text_editor, NULL); uri = midori_view_get_display_uri (MIDORI_VIEW (view)); if (!(text_editor && *text_editor)) @@ -3314,36 +3453,20 @@ _action_source_view_activate (GtkAction* action, webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri); gtk_widget_show (source); midori_browser_add_tab (browser, source); + g_free (text_editor); return; #else - GFile* file = g_file_new_for_uri (uri); - gchar* content_type; - GAppInfo* app_info; - GList* files; - gpointer context; - - #if GLIB_CHECK_VERSION (2, 18, 0) - content_type = g_content_type_from_mime_type ("text/plain"); - #else - content_type = g_strdup ("text/plain"); - #endif + GError* error = NULL; - app_info = g_app_info_get_default_for_type (content_type, - !g_str_has_prefix (uri, "file://")); - g_free (content_type); - files = g_list_prepend (NULL, file); - #if GTK_CHECK_VERSION (2, 14, 0) - context = gdk_app_launch_context_new (); - gdk_app_launch_context_set_screen (context, gtk_widget_get_screen (view)); - gdk_app_launch_context_set_timestamp (context, gtk_get_current_event_time ()); - #else - context = g_app_launch_context_new (); - #endif - if (g_app_info_launch (app_info, files, context, NULL)) + /* FIXME: Handling http transparently in the function would be nice */ + if (g_str_has_prefix (uri, "file://")) { - g_object_unref (app_info); - g_list_free (files); - g_object_unref (file); + if (!sokoke_show_uri_with_mime_type (gtk_widget_get_screen (view), + uri, "text/plain", gtk_get_current_event_time (), &error)) + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), error ? error->message : ""); + if (error) + g_error_free (error); g_free (text_editor); return; } @@ -3410,17 +3533,14 @@ static void _action_homepage_activate (GtkAction* action, MidoriBrowser* browser) { + gchar* homepage; + if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) { g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); return; } - gchar* homepage; - - if (!browser->settings) - return; - g_object_get (browser->settings, "homepage", &homepage, NULL); midori_browser_set_current_uri (browser, homepage); g_free (homepage); @@ -3430,7 +3550,7 @@ static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { - if (!browser->show_navigationbar) + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) gtk_widget_show (browser->navigationbar); } @@ -3459,10 +3579,30 @@ midori_browser_bookmark_homepage_clicked_cb (GtkToolItem* button, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static gboolean +midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, + GdkEventButton* event, + MidoriBrowser* browser) +{ + if (event->button == 2) + { + gchar* homepage; + guint n; + + g_object_get (browser->settings, "homepage", &homepage, NULL); + n = midori_browser_add_uri (browser, homepage); + g_free (homepage); + _midori_browser_set_current_page_smartly (browser, n); + return TRUE; + } + + return FALSE; +} + static void -browser_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* item, - GtkWidget* toolbar); +midori_browser_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + GtkWidget* toolbar); static void _action_location_focus_in (GtkAction* action, @@ -3527,6 +3667,14 @@ _action_location_submit_uri (GtkAction* action, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static void +midori_browser_news_feed_clicked_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + gchar* uri = g_object_get_data (G_OBJECT (menuitem), "uri"); + midori_browser_subscribe_to_news_feed (browser, uri); +} + static gboolean _action_location_secondary_icon_released (GtkAction* action, GtkWidget* widget, @@ -3540,7 +3688,51 @@ _action_location_secondary_icon_released (GtkAction* action, if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget) _action_location_submit_uri (action, uri, FALSE, browser); else if ((uri = g_object_get_data (G_OBJECT (view), "news-feeds"))) - _action_add_news_feed_activate (action, browser); + { + KatzeArray* news_feeds; + KatzeItem* item; + KatzeItem* itemm; + + news_feeds = katze_object_get_object (G_OBJECT (view), "news-feeds"); + item = katze_array_get_nth_item (news_feeds, 0); + if ((itemm = katze_array_get_nth_item (news_feeds, 1))) + { + guint i; + GtkWidget* menu; + GtkWidget* menuitem; + + menu = gtk_menu_new (); + menuitem = gtk_menu_item_new_with_label (katze_item_get_name (item)); + g_object_set_data_full (G_OBJECT (menuitem), "uri", + g_strdup (katze_item_get_uri (item)), (GDestroyNotify)g_free); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_news_feed_clicked_cb), browser); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_menu_item_new_with_label (katze_item_get_name (itemm)); + g_object_set_data_full (G_OBJECT (menuitem), "uri", + g_strdup (katze_item_get_uri (itemm)), (GDestroyNotify)g_free); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_news_feed_clicked_cb), browser); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + i = 2; + while ((itemm = katze_array_get_nth_item (news_feeds, i++))) + { + menuitem = gtk_menu_item_new_with_label ( + katze_item_get_name (itemm)); + g_object_set_data_full (G_OBJECT (menuitem), "uri", + g_strdup (katze_item_get_uri (itemm)), (GDestroyNotify)g_free); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_news_feed_clicked_cb), browser); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + } + sokoke_container_show_children (GTK_CONTAINER (menu)); + katze_widget_popup (widget, GTK_MENU (menu), NULL, + KATZE_MENU_POSITION_RIGHT); + } + else + midori_browser_subscribe_to_news_feed (browser, uri); + g_object_unref (news_feeds); + } else _action_location_submit_uri (action, uri, FALSE, browser); return TRUE; @@ -3560,9 +3752,6 @@ _action_search_submit (GtkAction* action, const gchar* url; gchar* search; - if (!browser->settings) - return; - g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) @@ -3736,8 +3925,8 @@ midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); - g_signal_emit (browser, signals[NEW_WINDOW], 0, new_browser); + MidoriBrowser* new_browser; + g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser); midori_browser_add_uri (new_browser, uri); } } @@ -3809,19 +3998,7 @@ midori_browser_bookmark_popup (GtkWidget* widget, midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, item, midori_browser_bookmark_delete_activate_cb, browser); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); -} - -static void -midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - KatzeItem* item; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "KatzeItem"); - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); - gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } static gboolean @@ -3829,15 +4006,25 @@ midori_browser_menu_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser) { - if (event->button == 3) + /* GtkMenuBar catches button events on children with submenus, + so we need to see if the actual widget is the menubar, and if + it is an item, we forward it to the actual widget. */ + toolitem = gtk_get_event_widget ((GdkEvent*)event); + + if (GTK_IS_MENU_BAR (toolitem) && event->button == 3) { midori_browser_toolbar_popup_context_menu_cb ( GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? gtk_widget_get_parent (toolitem) : toolitem, event->x, event->y, event->button, browser); - return TRUE; } + else if (GTK_IS_MENU_ITEM (toolitem) && event->button == 3) + { + gboolean handled; + g_signal_emit_by_name (toolitem, "button-press-event", event, &handled); + return handled; + } return FALSE; } @@ -3850,9 +4037,6 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser, g_return_val_if_fail (action != NULL, FALSE); - if (!browser->settings) - return FALSE; - g_object_get (browser->settings, "homepage", &homepage, NULL); name = gtk_action_get_name (action); @@ -3981,6 +4165,164 @@ _action_bookmark_folder_add_activate (GtkAction* action, midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); } +static void +_action_bookmarks_import_activate (GtkAction* action, + MidoriBrowser* browser) +{ + typedef struct + { + const gchar* path; + const gchar* name; + const gchar* icon; + } BookmarkClient; + static const BookmarkClient bookmark_clients[] = { + { ".local/share/data/Arora/bookmarks.xbel", N_("Arora"), "arora" }, + { ".kazehakase/bookmarks.xml", N_("Kazehakase"), "kazehakase-icon" }, + { ".opera/bookmarks.adr", N_("Opera"), "opera" }, + { ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" }, + { ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" }, + }; + + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + GtkWidget* hbox; + GtkWidget* label; + GtkWidget* combo; + GtkComboBox* combobox; + GtkListStore* model; + GtkCellRenderer* renderer; + GtkComboBox* combobox_folder; + gint icon_width = 16; + guint i; + KatzeItem* item; + + if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser)) + return; + + dialog = gtk_dialog_new_with_buttons ( + _("Import bookmarks..."), GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Import bookmarks"), GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), STOCK_BOOKMARKS); + + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Application:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_INT); + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model)); + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "icon-name", 1); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "width", 3); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0); + combobox = GTK_COMBO_BOX (combo); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL); + for (i = 0; i < G_N_ELEMENTS (bookmark_clients); i++) + { + gchar* path = g_build_filename (g_get_home_dir (), + bookmark_clients[i].path, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, _(bookmark_clients[i].name), 1, bookmark_clients[i].icon, + 2, path, 3, icon_width, -1); + g_free (path); + } + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, _("Custom..."), 1, NULL, 2, NULL, 3, icon_width, -1); + gtk_combo_box_set_active (combobox, 0); + gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Folder:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + combo = gtk_combo_box_new_text (); + combobox_folder = GTK_COMBO_BOX (combo); + gtk_combo_box_append_text (combobox_folder, _("Toplevel folder")); + gtk_combo_box_set_active (combobox_folder, 0); + i = 0; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) + { + if (KATZE_IS_ARRAY (item)) + { + const gchar* name = katze_item_get_name (item); + if (name) + gtk_combo_box_append_text (combobox_folder, name); + } + } + gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + /* FIXME: Importing into a subfolder doesn't work */ + gtk_widget_set_sensitive (combo, FALSE); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + GtkTreeIter iter; + gchar* path; + gchar* selected; + KatzeArray* folder; + GError* error; + + gtk_combo_box_get_active_iter (combobox, &iter); + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1); + + selected = gtk_combo_box_get_active_text (combobox_folder); + folder = browser->bookmarks; + if (g_strcmp0 (selected, _("Toplevel folder"))) + { + i = 0; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) + if (KATZE_IS_ARRAY (item)) + if (!g_strcmp0 (katze_item_get_name (item), selected)) + { + folder = KATZE_ARRAY (item); + break; + } + } + g_free (selected); + + gtk_widget_destroy (dialog); + if (!path) + { + GtkWidget* file_dialog; + + file_dialog = sokoke_file_chooser_dialog_new (_("Save file as"), + GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN); + if (gtk_dialog_run (GTK_DIALOG (file_dialog)) == GTK_RESPONSE_OK) + path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog)); + gtk_widget_destroy (file_dialog); + } + + error = NULL; + if (path && !midori_array_from_file (folder, path, NULL, &error)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Failed to import bookmarks"), error ? error->message : ""); + if (error) + g_error_free (error); + } + g_free (path); + } + else + gtk_widget_destroy (dialog); +} + static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) @@ -4066,6 +4408,15 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, } clear_prefs |= MIDORI_CLEAR_TRASH; } + button = g_object_get_data (G_OBJECT (dialog), "web-cache"); + if (gtk_toggle_button_get_active (button)) + { + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "web", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + clear_prefs |= MIDORI_CLEAR_WEB_CACHE; + } if (clear_prefs != saved_prefs) g_object_set (browser->settings, "clear-private-data", clear_prefs, NULL); @@ -4160,6 +4511,11 @@ _action_clear_private_data_activate (GtkAction* action, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); g_object_set_data (G_OBJECT (dialog), "trash", button); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + button = gtk_check_button_new_with_mnemonic (_("Web Cache")); + if ((clear_prefs & MIDORI_CLEAR_WEB_CACHE) == MIDORI_CLEAR_WEB_CACHE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + g_object_set_data (G_OBJECT (dialog), "web-cache", button); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (alignment), vbox); gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0); @@ -4316,8 +4672,7 @@ _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - if (browser->settings) - g_object_set (browser->settings, "show-panel", active, NULL); + g_object_set (browser->settings, "show-panel", active, NULL); sokoke_widget_set_visible (browser->panel, active); } @@ -4326,8 +4681,7 @@ midori_browser_panel_timeout (GtkWidget* hpaned) { gboolean position = gtk_paned_get_position (GTK_PANED (hpaned)); MidoriBrowser* browser = midori_browser_get_for_widget (hpaned); - if (browser->settings) - g_object_set (browser->settings, "last-panel-position", position, NULL); + g_object_set (browser->settings, "last-panel-position", position, NULL); browser->panel_timeout = 0; return FALSE; } @@ -4348,7 +4702,7 @@ midori_panel_notify_page_cb (MidoriPanel* panel, MidoriBrowser* browser) { gint page = katze_object_get_boolean (panel, "page"); - if (browser->settings && page > -1) + if (page > -1) g_object_set (browser->settings, "last-panel-page", page, NULL); } @@ -4358,14 +4712,11 @@ midori_panel_notify_show_titles_cb (MidoriPanel* panel, MidoriBrowser* browser) { gboolean show_titles = katze_object_get_boolean (panel, "show-titles"); - if (browser->settings) - { - g_signal_handlers_block_by_func (browser->settings, - midori_browser_settings_notify, browser); - g_object_set (browser->settings, "compact-sidepanel", !show_titles, NULL); - g_signal_handlers_unblock_by_func (browser->settings, - midori_browser_settings_notify, browser); - } + g_signal_handlers_block_by_func (browser->settings, + midori_browser_settings_notify, browser); + g_object_set (browser->settings, "compact-sidepanel", !show_titles, NULL); + g_signal_handlers_unblock_by_func (browser->settings, + midori_browser_settings_notify, browser); } static void @@ -4374,14 +4725,11 @@ midori_panel_notify_show_controls_cb (MidoriPanel* panel, MidoriBrowser* browser) { gboolean show_controls = katze_object_get_boolean (panel, "show-controls"); - if (browser->settings) - { - g_signal_handlers_block_by_func (browser->settings, - midori_browser_settings_notify, browser); - g_object_set (browser->settings, "show-panel-controls", show_controls, NULL); - g_signal_handlers_unblock_by_func (browser->settings, - midori_browser_settings_notify, browser); - } + g_signal_handlers_block_by_func (browser->settings, + midori_browser_settings_notify, browser); + g_object_set (browser->settings, "show-panel-controls", show_controls, NULL); + g_signal_handlers_unblock_by_func (browser->settings, + midori_browser_settings_notify, browser); } static void @@ -4395,9 +4743,7 @@ midori_panel_notify_right_aligned_cb (MidoriPanel* panel, gint paned_position = gtk_paned_get_position (GTK_PANED (hpaned)); gint paned_size = hpaned->allocation.width; - if (browser->settings) - g_object_set (browser->settings, "right-align-sidepanel", - right_aligned, NULL); + g_object_set (browser->settings, "right-align-sidepanel", right_aligned, NULL); g_object_ref (browser->panel); g_object_ref (vpaned); @@ -4520,12 +4866,9 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, gint n; GtkWidget* view; - if (browser->settings) - view = g_object_new (MIDORI_TYPE_VIEW, - "settings", browser->settings, - "net", browser->net, NULL); - else - view = midori_view_new (browser->net); + view = g_object_new (MIDORI_TYPE_VIEW, + "settings", browser->settings, + "net", browser->net, NULL); midori_view_set_uri (MIDORI_VIEW (view), ""); gtk_widget_show (view); g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1); @@ -4577,6 +4920,10 @@ static const GtkActionEntry entries[] = { { "TabNew", STOCK_TAB_NEW, NULL, "t", N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) }, + { "PrivateBrowsing", NULL, + N_("P_rivate Browsing"), "n", + N_("Don't save any private data while browsing"), + G_CALLBACK (_action_private_browsing_activate), }, { "Open", GTK_STOCK_OPEN, NULL, "o", N_("Open a file"), G_CALLBACK (_action_open_activate) }, @@ -4638,7 +4985,7 @@ static const GtkActionEntry entries[] = { { "Find", GTK_STOCK_FIND, NULL, "f", N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) }, - { "FindNext", NULL, + { "FindNext", GTK_STOCK_GO_FORWARD, N_("Find _Next"), "g", N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, @@ -4704,6 +5051,9 @@ static const GtkActionEntry entries[] = { { "BookmarkFolderAdd", NULL, N_("Add a new _folder"), "", N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) }, + { "BookmarksImport", NULL, + N_("_Import bookmarks"), "", + NULL, G_CALLBACK (_action_bookmarks_import_activate) }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", N_("Add, edit and remove search engines..."), @@ -4744,12 +5094,6 @@ static const GtkActionEntry entries[] = { static const guint entries_n = G_N_ELEMENTS (entries); static const GtkToggleActionEntry toggle_entries[] = { - { "PrivateBrowsing", NULL, - N_("P_rivate Browsing"), "", - N_("Don't save any private data while browsing"), - NULL/*G_CALLBACK (_action_private_browsing_activate)*/, - FALSE }, - { "Menubar", NULL, N_("_Menubar"), "", N_("Show menubar"), G_CALLBACK (_action_menubar_activate), @@ -4788,6 +5132,9 @@ static const GtkRadioActionEntry encoding_entries[] = { /* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */ N_("Japanese (SHIFT__JIS)"), "", NULL, 1 }, + { "EncodingKorean", NULL, + N_("Korean (EUC-KR)"), "", + NULL, 1 }, { "EncodingRussian", NULL, N_("Russian (KOI8-R)"), "", NULL, 1 }, @@ -4898,6 +5245,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -4909,7 +5257,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -4943,8 +5290,8 @@ static const gchar* ui_markup = "" "" "" - "" "" + "" "" "" "" @@ -4954,6 +5301,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -4987,6 +5335,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -5008,6 +5357,15 @@ midori_browser_realize_cb (GtkStyle* style, { GdkScreen* screen; GtkIconTheme* icon_theme; + #ifdef HAVE_HILDON_2_2 + /* hildon_gtk_window_enable_zoom_keys */ + guint32 set = 1; + gdk_property_change (GTK_WIDGET (browser)->window, + gdk_atom_intern ("_HILDON_ZOOM_KEY_ATOM", FALSE), + gdk_x11_xatom_to_atom (XA_INTEGER), + 32, GDK_PROP_MODE_REPLACE, + (const guchar *) &set, 1); + #endif screen = gtk_widget_get_screen (GTK_WIDGET (browser)); if (screen) @@ -5116,10 +5474,12 @@ midori_browser_set_history (MidoriBrowser* browser, if (history && ((recently_visited = katze_array_get_nth_item (history, katze_array_get_length (KATZE_ARRAY (history)) - 1)))) g_object_set (_action_by_name (browser, "RecentlyVisited"), - "array", recently_visited, NULL); + "array", recently_visited, "reversed", TRUE, + NULL); else g_object_set (_action_by_name (browser, "RecentlyVisited"), - "array", NULL, NULL); + "array", NULL, "reversed", FALSE, + NULL); if (!history) return; @@ -5190,6 +5550,58 @@ midori_browser_ui_manager_disconnect_proxy_cb (GtkUIManager* ui_manager, } } +#ifdef HAVE_HILDON_2_2 +static void +midori_browser_set_portrait_mode (MidoriBrowser* browser, + gboolean portrait) +{ + if (portrait) + hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser), + HILDON_PORTRAIT_MODE_REQUEST); + else + hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser), + ~HILDON_PORTRAIT_MODE_REQUEST); + _action_set_visible (browser, "Tools", !portrait); + _action_set_visible (browser, "CompactAdd", !portrait); + _action_set_visible (browser, "Back", !portrait); + _action_set_visible (browser, "SourceView", !portrait); + _action_set_visible (browser, "Fullscreen", !portrait); +} + +static DBusHandlerResult +midori_browser_mce_filter_cb (DBusConnection* connection, + DBusMessage* message, + gpointer data) +{ + if (dbus_message_is_signal (message, MCE_SIGNAL_IF, MCE_DEVICE_ORIENTATION_SIG)) + { + DBusError error; + char *rotation, *stand, *face; + int x, y, z; + + dbus_error_init (&error); + if (dbus_message_get_args (message, + &error, + DBUS_TYPE_STRING, &rotation, + DBUS_TYPE_STRING, &stand, + DBUS_TYPE_STRING, &face, + DBUS_TYPE_INT32, &x, + DBUS_TYPE_INT32, &y, + DBUS_TYPE_INT32, &z, DBUS_TYPE_INVALID)) + { + gboolean portrait = !strcmp (rotation, MCE_ORIENTATION_PORTRAIT); + midori_browser_set_portrait_mode (MIDORI_BROWSER (data), portrait); + } + else + { + g_warning ("%s: %s\n", error.name, error.message); + dbus_error_free (&error); + } + } + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} +#endif + static void midori_browser_init (MidoriBrowser* browser) { @@ -5210,6 +5622,7 @@ midori_browser_init (MidoriBrowser* browser) GtkWidget* vpaned; GtkToolItem* toolitem; GtkRcStyle* rcstyle; + GtkWidget* label; GtkWidget* scrolled; GtkWidget* icon; @@ -5252,9 +5665,9 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_ui_manager_connect_proxy_cb), browser); g_signal_connect (ui_manager, "disconnect-proxy", G_CALLBACK (midori_browser_ui_manager_disconnect_proxy_cb), browser); - gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0); accel_group = gtk_ui_manager_get_accel_group (ui_manager); gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); + gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0); g_object_set_data (G_OBJECT (accel_group), "midori-browser", browser); for (i = 0; i < 10; i++) @@ -5387,6 +5800,7 @@ midori_browser_init (MidoriBrowser* browser) action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Tools", "label", _("_Tools"), + "stock-id", GTK_STOCK_PREFERENCES, "array", katze_array_new (KATZE_TYPE_ITEM), NULL); g_object_connect (action, @@ -5427,6 +5841,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (action); /* Create the menubar */ + browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); + gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); + gtk_widget_hide (browser->menubar); #if HAVE_HILDON #if HILDON_CHECK_VERSION (2, 2, 0) browser->menubar = hildon_app_menu_new (); @@ -5440,9 +5857,6 @@ midori_browser_init (MidoriBrowser* browser) hildon_program_add_window (hildon_program_get_instance (), HILDON_WINDOW (browser)); #else - browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); - gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); - gtk_widget_hide (browser->menubar); g_signal_connect (browser->menubar, "button-press-event", G_CALLBACK (midori_browser_menu_button_press_event_cb), browser); @@ -5472,20 +5886,17 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (forward, "button-press-event", G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); - - _action_set_sensitive (browser, "PrivateBrowsing", FALSE); #if HAVE_HILDON - g_object_set (_action_by_name (browser, "Menubar"), "visible", FALSE, NULL); - g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL); + _action_set_visible (browser, "Menubar", FALSE); #endif #if !WEBKIT_CHECK_VERSION (1, 1, 3) - _action_set_sensitive (browser, "Transferbar", FALSE); + _action_set_visible (browser, "Transferbar", FALSE); #endif _action_set_sensitive (browser, "EncodingCustom", FALSE); - _action_set_sensitive (browser, "SelectionSourceView", FALSE); - _action_set_sensitive (browser, "LastSession", FALSE); - /* FIXME: Enable once implemented */ - _action_set_sensitive (browser, "AddDesktopShortcut", FALSE); + _action_set_visible (browser, "SelectionSourceView", FALSE); + _action_set_visible (browser, "LastSession", FALSE); + /* FIXME: Show once implemented */ + _action_set_visible (browser, "AddDesktopShortcut", FALSE); /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( @@ -5507,6 +5918,18 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); #endif + #ifdef HAVE_HILDON_2_2 + DBusConnection* system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, NULL); + if (system_bus) + { + dbus_bus_add_match (system_bus, MCE_SIGNAL_MATCH, NULL); + dbus_connection_add_filter (system_bus, + midori_browser_mce_filter_cb, browser, NULL); + hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser), + HILDON_PORTRAIT_MODE_SUPPORT); + } + #endif + /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar"); @@ -5519,6 +5942,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (GTK_WIDGET (browser->homepage)); g_signal_connect (browser->homepage, "clicked", G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), browser); + g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->homepage)), "button-press-event", + G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser); gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); #if HAVE_HILDON hildon_window_add_toolbar (HILDON_WINDOW (browser), @@ -5537,6 +5962,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); browser->panel = g_object_new (MIDORI_TYPE_PANEL, + "action-group", browser->action_group, "menu", browser->menu_tools, NULL); g_object_connect (browser->panel, @@ -5609,6 +6035,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_label_new_with_mnemonic (_("_Inline Find:"))); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_text = gtk_icon_entry_new (); + #if !HAVE_HILDON gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); @@ -5617,6 +6044,7 @@ midori_browser_init (MidoriBrowser* browser) GTK_STOCK_CLEAR); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_SECONDARY, TRUE); + #endif g_signal_connect (browser->find_text, "icon-release", G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); g_signal_connect (browser->find_text, "activate", @@ -5629,6 +6057,10 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + #if HAVE_HILDON + browser->find_case = gtk_toggle_tool_button_new (); + browser->find_highlight = gtk_toggle_tool_button_new (); + #else toolitem = (GtkToolItem*)gtk_action_create_tool_item (_action_by_name (browser, "FindPrevious")); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Previous")); @@ -5646,6 +6078,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_case, -1); browser->find_highlight = gtk_toggle_tool_button_new_from_stock ( GTK_STOCK_SELECT_ALL); + #endif g_signal_connect (browser->find_highlight, "toggled", G_CALLBACK (_find_highlight_toggled), browser); gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_highlight), @@ -5655,7 +6088,9 @@ midori_browser_init (MidoriBrowser* browser) toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw ( GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); + #if !HAVE_HILDON gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + #endif gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_close), @@ -5677,22 +6112,33 @@ midori_browser_init (MidoriBrowser* browser) /* Statusbar */ browser->statusbar = gtk_statusbar_new (); - /* Adjust the statusbar's padding to avoid child overlapping */ - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = -4; - gtk_widget_modify_style (browser->statusbar, rcstyle); - g_object_unref (rcstyle); + /* Rearrange the statusbar packing. This is necessariy to keep + themes happy while there is no support from GtkStatusbar. */ + label = GTK_STATUSBAR (browser->statusbar)->label; + if (GTK_IS_BOX (gtk_widget_get_parent (label))) + browser->statusbar_contents = gtk_widget_get_parent (label); + else + { + browser->statusbar_contents = gtk_hbox_new (FALSE, 4); + gtk_widget_show (browser->statusbar_contents); + g_object_ref (GTK_STATUSBAR (browser->statusbar)->label); + gtk_container_remove ( + GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), label); + gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), + label, TRUE, TRUE, 0); + g_object_unref (label); + gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), + browser->statusbar_contents); + } gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); browser->progressbar = gtk_progress_bar_new (); - /* Set the progressbar's height to 1 to fit it in the statusbar */ - gtk_widget_set_size_request (browser->progressbar, -1, 1); - gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, - FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), + browser->progressbar, FALSE, FALSE, 3); browser->transferbar = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->transferbar, - FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), + browser->transferbar, FALSE, FALSE, 3); gtk_widget_show (browser->transferbar); browser->transferbar_clear = gtk_button_new_with_label (_("Clear All")); icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); @@ -5723,10 +6169,9 @@ midori_browser_finalize (GObject* object) { MidoriBrowser* browser = MIDORI_BROWSER (object); - if (browser->settings) - g_signal_handlers_disconnect_by_func (browser->settings, - midori_browser_settings_notify, - browser); + g_signal_handlers_disconnect_by_func (browser->settings, + midori_browser_settings_notify, + browser); katze_assign (browser->statusbar_text, NULL); @@ -5747,11 +6192,10 @@ static void _midori_browser_set_toolbar_style (MidoriBrowser* browser, MidoriToolbarStyle toolbar_style) { - #if HAVE_HILDON - GtkToolbarStyle gtk_toolbar_style = GTK_TOOLBAR_ICONS; - #else GtkToolbarStyle gtk_toolbar_style; + GtkIconSize icon_size; GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); + g_object_get (gtk_settings, "gtk-toolbar-icon-size", &icon_size, NULL); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) #ifdef G_OS_WIN32 gtk_toolbar_style = GTK_TOOLBAR_ICONS; @@ -5762,6 +6206,8 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, { switch (toolbar_style) { + case MIDORI_TOOLBAR_SMALL_ICONS: + icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; case MIDORI_TOOLBAR_ICONS: gtk_toolbar_style = GTK_TOOLBAR_ICONS; break; @@ -5776,9 +6222,9 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; } } - #endif gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), gtk_toolbar_style); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), icon_size); } static gboolean @@ -5814,10 +6260,6 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, GtkAction* action; GtkWidget* toolitem; - #if HAVE_HILDON - items = "Bookmarks,CompactAdd,ReloadStop,Location,Back,Fullscreen"; - #endif - gtk_container_foreach (GTK_CONTAINER (browser->navigationbar), (GtkCallback)gtk_widget_destroy, NULL); @@ -5856,7 +6298,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gboolean remember_last_window_size; gint last_window_width, last_window_height; MidoriWindowState last_window_state; - gboolean compact_sidepanel, show_panel_controls, right_align_sidepanel; + gboolean compact_sidepanel, show_panel_controls; + gboolean right_align_sidepanel, open_panels_in_windows; gint last_panel_position, last_panel_page; gboolean show_menubar, show_bookmarkbar; gboolean show_panel, show_transferbar; @@ -5879,6 +6322,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "compact-sidepanel", &compact_sidepanel, "show-panel-controls", &show_panel_controls, "right-align-sidepanel", &right_align_sidepanel, + "open-panels-in-windows", &open_panels_in_windows, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, "show-menubar", &show_menubar, @@ -5895,7 +6339,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "location-entry-search", &browser->location_entry_search, "close-buttons-on-tabs", &close_buttons_on_tabs, "progress-in-location", &browser->progress_in_location, - "remember-last-visited-pages", &browser->remember_last_visited_pages, + "maximum-history-age", &browser->maximum_history_age, "news-aggregator", &browser->news_aggregator, NULL); @@ -5953,7 +6397,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) g_object_set (browser->panel, "show-titles", !compact_sidepanel, "show-controls", show_panel_controls, - "right-aligned", right_align_sidepanel, NULL); + "right-aligned", right_align_sidepanel, + "open-panels-in-windows", open_panels_in_windows, NULL); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); /* The browser may not yet be visible, which means that we can't set the @@ -6014,8 +6459,13 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_signal_handlers_unblock_by_func (browser->panel, midori_panel_notify_show_controls_cb, browser); } + else if (name == g_intern_string ("open-panels-in-windows")) + g_object_set (browser->panel, "open-panels-in-windows", + g_value_get_boolean (&value), NULL); else if (name == g_intern_string ("always-show-tabbar")) _toggle_tabbar_smartly (browser); + else if (name == g_intern_string ("show-menubar")) + sokoke_widget_set_visible (browser->menubar, g_value_get_boolean (&value)); else if (name == g_intern_string ("show-navigationbar")) browser->show_navigationbar = g_value_get_boolean (&value); else if (name == g_intern_string ("show-statusbar")) @@ -6040,8 +6490,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, { katze_assign (browser->location_entry_search, g_value_dup_string (&value)); } - else if (name == g_intern_string ("remember-last-visited-pages")) - browser->remember_last_visited_pages = g_value_get_boolean (&value); + else if (name == g_intern_string ("maximum-history-age")) + browser->maximum_history_age = g_value_get_boolean (&value); else if (name == g_intern_string ("news-aggregator")) { katze_assign (browser->news_aggregator, g_value_dup_string (&value)); @@ -6052,80 +6502,123 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_unset (&value); } +static GtkWidget* +midori_browser_toolitem_for_item (KatzeItem* item, + GtkWidget* toolbar) + +{ + GList* children = gtk_container_get_children (GTK_CONTAINER (toolbar)); + while (children != NULL) + { + void* toolitem = children->data; + void* found_item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); + + if (found_item == item) + return toolitem; + children = g_list_next (children); + } + return NULL; +} + static void -browser_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* item, - GtkWidget* toolbar) +midori_browser_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + GtkWidget* toolbar) { - MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); - GtkToolItem* toolitem; + GtkWidget* toolitem = midori_browser_toolitem_for_item (removed_item, toolbar); + if (toolitem) + gtk_widget_destroy (toolitem); +} - toolitem = katze_array_action_create_tool_item_for ( - KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); +static void +midori_browser_bookmarks_meta_data_changed_toolbar_cb (KatzeItem* item, + const gchar* key, + GtkWidget* toolbar) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); - g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); - if (!KATZE_IS_ARRAY (item) && katze_item_get_uri (item)) - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), - browser); - if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + if (katze_item_get_meta_string (item, "toolbar")) { - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), - browser); - g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), - "KatzeItem", item); + GtkToolItem* toolitem; + + if ((toolitem = (GtkToolItem*)midori_browser_toolitem_for_item (item, toolbar))) + return; + + toolitem = katze_array_action_create_tool_item_for ( + KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); + g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + + if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + { + GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem)); + g_signal_connect (child, "button-press-event", + G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), + browser); + g_object_set_data (G_OBJECT (child), "KatzeItem", item); + } + else /* Separator */ + { + gtk_tool_item_set_use_drag_window (toolitem, TRUE); + g_signal_connect (toolitem, "button-press-event", + G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), + browser); + } + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); } else { - gtk_tool_item_set_use_drag_window (toolitem, TRUE); - g_signal_connect (toolitem, - "button-press-event", - G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), - browser); - g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + KatzeArray* array = katze_item_get_parent (item); + midori_browser_bookmarks_remove_item_cb (array, item, toolbar); } - gtk_widget_show (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); } static void -browser_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* removed_item, - MidoriBrowser* browser) +midori_browser_bookmarks_connect_item (KatzeArray* array, + KatzeItem* item, + GtkWidget* toolbar) { - GList* children; - GtkWidget* toolitem; - KatzeItem* item; - - children = gtk_container_get_children (GTK_CONTAINER (browser->bookmarkbar)); - while (children != NULL) + if (KATZE_IS_ARRAY (item)) { - toolitem = GTK_WIDGET (children->data); - item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - if (item == removed_item) - gtk_widget_destroy (toolitem); - children = g_list_next (children); + KatzeItem* child; + guint i = 0; + while ((child = katze_array_get_nth_item ((KatzeArray*)item, i++))) + midori_browser_bookmarks_connect_item ((KatzeArray*)item, child, toolbar); + + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_browser_bookmarks_add_item_cb), toolbar); + g_signal_connect_after (item, "remove-item", + G_CALLBACK (midori_browser_bookmarks_remove_item_cb), toolbar); } + + if (katze_item_get_meta_string (item, "toolbar")) + midori_browser_bookmarks_meta_data_changed_toolbar_cb (item, "toolbar", toolbar); + g_signal_connect (item, "meta-data-changed::toolbar", + G_CALLBACK (midori_browser_bookmarks_meta_data_changed_toolbar_cb), toolbar); +} + +static void +midori_browser_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + GtkWidget* toolbar) +{ + midori_browser_bookmarks_connect_item (array, item, toolbar); } static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks) { - guint i; - KatzeItem* item; - if (browser->bookmarks == bookmarks) return; if (browser->bookmarks) { g_signal_handlers_disconnect_by_func ( - browser->bookmarks, browser_bookmarks_add_item_cb, browser->bookmarkbar); + browser->bookmarks, midori_browser_bookmarks_add_item_cb, browser->bookmarkbar); g_signal_handlers_disconnect_by_func ( - browser->bookmarks, browser_bookmarks_remove_item_cb, browser); + browser->bookmarks, midori_browser_bookmarks_remove_item_cb, browser->bookmarkbar); + /* FIXME: Disconnect recursively */ } if (bookmarks) @@ -6141,13 +6634,12 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, if (!browser->bookmarks) return; - i = 0; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - browser_bookmarks_add_item_cb (browser->bookmarks, item, browser->bookmarkbar); + midori_browser_bookmarks_connect_item (NULL, (KatzeItem*)browser->bookmarks, + browser->bookmarkbar); g_signal_connect (browser->bookmarks, "add-item", - G_CALLBACK (browser_bookmarks_add_item_cb), browser->bookmarkbar); + G_CALLBACK (midori_browser_bookmarks_add_item_cb), browser->bookmarkbar); g_signal_connect (browser->bookmarks, "remove-item", - G_CALLBACK (browser_bookmarks_remove_item_cb), browser); + G_CALLBACK (midori_browser_bookmarks_remove_item_cb), browser->bookmarkbar); _action_set_sensitive (browser, "BookmarkAdd", TRUE); _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); @@ -6175,17 +6667,16 @@ midori_browser_set_property (GObject* object, _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); break; case PROP_SETTINGS: - if (browser->settings) - g_signal_handlers_disconnect_by_func (browser->settings, - midori_browser_settings_notify, - browser); + g_signal_handlers_disconnect_by_func (browser->settings, + midori_browser_settings_notify, + browser); katze_object_assign (browser->settings, g_value_dup_object (value)); - if (browser->settings) - { - _midori_browser_update_settings (browser); - g_signal_connect (browser->settings, "notify", - G_CALLBACK (midori_browser_settings_notify), browser); - } + if (!browser->settings) + browser->settings = midori_web_settings_new (); + + _midori_browser_update_settings (browser); + g_signal_connect (browser->settings, "notify", + G_CALLBACK (midori_browser_settings_notify), browser); gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) midori_view_set_settings, browser->settings); break; @@ -6195,35 +6686,33 @@ midori_browser_set_property (GObject* object, case PROP_TRASH: /* FIXME: Disconnect handlers */ katze_object_assign (browser->trash, g_value_dup_object (value)); - g_object_set (_action_by_name (browser, "Trash"), "array", - browser->trash, NULL); + g_object_set (_action_by_name (browser, "Trash"), + "array", browser->trash, "reversed", TRUE, + NULL); /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; case PROP_SEARCH_ENGINES: + { + guint i; + /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); - if (browser->settings) - { - if (katze_object_get_boolean (browser->settings, - "search-engines-in-completion")) - midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), browser->search_engines); - else - midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), NULL); - } + if (katze_object_get_boolean (browser->settings, + "search-engines-in-completion")) + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->search_engines); + else + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), NULL); midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ - if (browser->settings) - { - guint i; - g_object_get (browser->settings, "last-web-search", - &last_web_search, NULL); - item = katze_array_get_nth_item (browser->search_engines, - last_web_search); + if (browser->search_engines) + { + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); + item = katze_array_get_nth_item (browser->search_engines, last_web_search); midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); @@ -6237,6 +6726,7 @@ midori_browser_set_property (GObject* object, } } break; + } case PROP_HISTORY: midori_browser_set_history (browser, g_value_get_object (value)); break; @@ -6295,7 +6785,7 @@ midori_browser_get_property (GObject* object, break; } case PROP_STATUSBAR: - g_value_set_object (value, browser->statusbar); + g_value_set_object (value, browser->statusbar_contents); break; case PROP_STATUSBAR_TEXT: g_value_set_string (value, browser->statusbar_text); @@ -6447,11 +6937,8 @@ midori_browser_add_uri (MidoriBrowser* browser, g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (uri != NULL, -1); - if (browser->settings) - view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, - "net", browser->net, NULL); - else - view = midori_view_new (browser->net); + view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, + "net", browser->net, NULL); midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 9eceea8b..f04ff2af 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -658,7 +658,7 @@ midori_extension_set_boolean (MidoriExtension* extension, /* FIXME: Handle readonly folder/ file */ gchar* config_file = g_build_filename (extension->priv->config_dir, "config", NULL); - g_mkdir_with_parents (extension->priv->config_dir, 0700); + katze_mkdir_with_parents (extension->priv->config_dir, 0700); g_key_file_set_boolean (extension->priv->key_file, "settings", name, value); sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); @@ -755,7 +755,7 @@ midori_extension_set_integer (MidoriExtension* extension, /* FIXME: Handle readonly folder/ file */ gchar* config_file = g_build_filename (extension->priv->config_dir, "config", NULL); - g_mkdir_with_parents (extension->priv->config_dir, 0700); + katze_mkdir_with_parents (extension->priv->config_dir, 0700); g_key_file_set_integer (extension->priv->key_file, "settings", name, value); sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); @@ -852,7 +852,7 @@ midori_extension_set_string (MidoriExtension* extension, /* FIXME: Handle readonly folder/ file */ gchar* config_file = g_build_filename (extension->priv->config_dir, "config", NULL); - g_mkdir_with_parents (extension->priv->config_dir, 0700); + katze_mkdir_with_parents (extension->priv->config_dir, 0700); g_key_file_set_string (extension->priv->key_file, "settings", name, value); sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); @@ -964,7 +964,7 @@ midori_extension_set_string_list (MidoriExtension* extension, /* FIXME: Handle readonly folder/ file */ gchar* config_file = g_build_filename (extension->priv->config_dir, "config", NULL); - g_mkdir_with_parents (extension->priv->config_dir, 0700); + katze_mkdir_with_parents (extension->priv->config_dir, 0700); g_key_file_set_string_list (extension->priv->key_file, "settings", name, (const gchar**)value, length); sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 60e36cff..f74d6025 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -15,6 +15,7 @@ #include "gtkiconentry.h" #include "marshal.h" #include "sokoke.h" +#include "midori-browser.h" #include #include @@ -421,13 +422,8 @@ midori_location_action_insert_history_item (MidoriLocationAction* action, else { uri = katze_item_get_uri (item); - pixbuf = katze_net_load_icon (action->net, katze_item_get_uri (item), - NULL, NULL, NULL); - if (!pixbuf) - pixbuf = action->default_icon; midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); - g_object_unref (pixbuf); g_signal_connect (katze_item_get_parent (item), "remove-item", G_CALLBACK (midori_location_action_history_remove_item_cb), action); } @@ -576,7 +572,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, if ((uri = gtk_entry_get_text (entry)) && *uri) { g_signal_emit (action, signals[SUBMIT_URI], 0, uri, - (event->state & GDK_MOD1_MASK) ? TRUE : FALSE); + (event->state & GDK_CONTROL_MASK) ? TRUE : FALSE); return TRUE; } } @@ -630,6 +626,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, { gchar* uri; gchar* title; + GdkPixbuf* icon; gchar* desc; gchar* desc_uri; gchar* desc_title; @@ -641,19 +638,39 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar** parts; size_t len; - gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + entry = data; - desc = desc_uri = desc_title = key = NULL; - if (G_LIKELY (data)) + gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, + FAVICON_COL, &icon, -1); + + if (G_UNLIKELY (!icon) && uri) { - entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (data)); - key = title ? g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1) - : g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); - len = 0; + #if !HAVE_HILDON + MidoriLocationAction* action + = g_object_get_data (G_OBJECT (renderer), "location-action"); + if ((icon = katze_load_cached_icon (uri, NULL))) + { + midori_location_action_set_icon_for_uri (action, icon, uri); + g_object_unref (icon); + } + else + midori_location_action_set_icon_for_uri (action, action->default_icon, uri); + #endif } - if (G_LIKELY (data && uri)) + else if (icon) + g_object_unref (icon); + + desc = desc_uri = desc_title = key = NULL; + key = title ? g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1) + : g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); + len = 0; + + /* g_uri_unescape_segment () sometimes produces garbage */ + if (G_UNLIKELY (uri && !g_utf8_validate (uri, -1, (const gchar **)&temp))) + temp[0]='\0'; + else if (G_LIKELY (uri)) { - temp = g_ascii_strdown (uri, -1); + temp = g_utf8_strdown (uri, -1); if (key && *key && (start = strstr (temp, key))) { len = strlen (key); @@ -662,11 +679,9 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, if (skey && *skey && (parts = g_strsplit (uri, skey, 2))) { if (parts[0] && parts[1]) - { desc_uri = g_markup_printf_escaped ("%s%s%s", parts[0], skey, parts[1]); - g_strfreev (parts); - } + g_strfreev (parts); } g_free (skey); } @@ -674,7 +689,11 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, } if (uri && !desc_uri) desc_uri = g_markup_escape_text (uri, -1); - if (G_LIKELY (data && title)) + + /* g_uri_unescape_segment () sometimes produces garbage */ + if (G_UNLIKELY (title && !g_utf8_validate (title, -1, (const gchar **)&temp))) + temp[0]='\0'; + else if (G_LIKELY (title)) { temp = g_utf8_strdown (title, -1); if (key && *key && (start = strstr (temp, key))) @@ -724,7 +743,6 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, gchar* uri; gchar* title; gboolean match; - gchar* temp; model = gtk_entry_completion_get_model (completion); gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); @@ -732,17 +750,20 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, match = FALSE; if (G_LIKELY (uri)) { - temp = g_utf8_casefold (uri, -1); - match = (strstr (temp, key) != NULL); - g_free (temp); + gchar* fkey = g_utf8_casefold (key, -1); + gchar* furi = g_utf8_casefold (uri, -1); g_free (uri); + match = strstr (furi, fkey) != NULL; + g_free (furi); if (!match && G_LIKELY (title)) { - temp = g_utf8_casefold (title, -1); - match = (strstr (temp, key) != NULL); - g_free (temp); + gchar* ftitle = g_utf8_casefold (title, -1); + match = strstr (ftitle, fkey) != NULL; + g_free (ftitle); } + + g_free (fkey); } g_free (title); @@ -880,7 +901,7 @@ midori_location_action_set_item (MidoriLocationAction* location_action, g_object_unref (original_icon); } else - new_icon = location_action->default_icon; + new_icon = NULL; if (new_icon) gtk_list_store_set (GTK_LIST_STORE (model), &iter, FAVICON_COL, new_icon, -1); @@ -998,13 +1019,14 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (completion), renderer, "pixbuf", FAVICON_COL, "yalign", YALIGN_COL, NULL); renderer = gtk_cell_renderer_text_new (); + g_object_set_data (G_OBJECT (renderer), "location-action", location_action); gtk_cell_renderer_set_fixed_size (renderer, 1, -1); gtk_cell_renderer_text_set_fixed_height_from_font ( GTK_CELL_RENDERER_TEXT (renderer), 2); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, midori_location_entry_render_text_cb, - completion, NULL); + entry, NULL); gtk_entry_completion_set_match_func (completion, midori_location_entry_completion_match_cb, NULL, NULL); @@ -1052,11 +1074,27 @@ midori_location_action_entry_changed_cb (GtkComboBox* combo_box, } } +static void +midori_location_action_populate_popup_cb (GtkWidget* entry, + GtkMenuShell* menu, + MidoriLocationAction* location_action) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (entry); + GtkActionGroup* actions = midori_browser_get_action_group (browser); + GtkWidget* menuitem; + + menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + gtk_menu_shell_append (menu, menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "ManageSearchEngines")); + gtk_menu_shell_append (menu, menuitem); +} + static void midori_location_action_connect_proxy (GtkAction* action, GtkWidget* proxy) { - GtkWidget* entry; MidoriLocationAction* location_action; GtkCellRenderer* renderer; @@ -1070,7 +1108,8 @@ midori_location_action_connect_proxy (GtkAction* action, if (GTK_IS_TOOL_ITEM (proxy)) { - entry = midori_location_action_entry_for_proxy (proxy); + GtkWidget* entry = midori_location_action_entry_for_proxy (proxy); + GtkWidget* child = gtk_bin_get_child (GTK_BIN (entry)); midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), MIDORI_LOCATION_ACTION (action)->progress); @@ -1086,17 +1125,17 @@ midori_location_action_connect_proxy (GtkAction* action, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (entry), renderer, "pixbuf", FAVICON_COL, "yalign", YALIGN_COL, NULL); renderer = gtk_cell_renderer_text_new (); + g_object_set_data (G_OBJECT (renderer), "location-action", action); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (entry), - renderer, midori_location_entry_render_text_cb, NULL, NULL); + renderer, midori_location_entry_render_text_cb, child, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1); - midori_location_action_completion_init (location_action, - GTK_ENTRY (gtk_bin_get_child (GTK_BIN (entry)))); + midori_location_action_completion_init (location_action, GTK_ENTRY (child)); g_signal_connect (entry, "changed", G_CALLBACK (midori_location_action_entry_changed_cb), action); - g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), + g_object_connect (child, "signal::changed", midori_location_action_changed_cb, action, "signal::key-press-event", @@ -1107,6 +1146,8 @@ midori_location_action_connect_proxy (GtkAction* action, midori_location_action_focus_out_event_cb, action, "signal::icon-release", midori_location_action_icon_released_cb, action, + "signal::populate-popup", + midori_location_action_populate_popup_cb, action, NULL); } } @@ -1246,11 +1287,11 @@ void midori_location_action_set_icon (MidoriLocationAction* location_action, GdkPixbuf* icon) { + #if !HAVE_HILDON GSList* proxies; GtkWidget* location_entry; GtkWidget* entry; - #if !HAVE_HILDON g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); @@ -1293,9 +1334,11 @@ midori_location_action_add_item (MidoriLocationAction* location_action, GdkPixbuf* icon, const gchar* title) { + #if !HAVE_HILDON GSList* proxies; GtkWidget* location_entry; GtkWidget* entry; + #endif g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); @@ -1328,9 +1371,11 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, GdkPixbuf* icon, const gchar* uri) { + #if !HAVE_HILDON GSList* proxies; GtkWidget* location_entry; GtkWidget* entry; + #endif g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); @@ -1405,8 +1450,9 @@ midori_location_action_set_search_engines (MidoriLocationAction* location_action completion = gtk_entry_get_completion (GTK_ENTRY (child)); i = 0; if (location_action->search_engines) - while ((item = katze_array_get_nth_item (location_action->search_engines, i++))) - gtk_entry_completion_delete_action (completion, 0); + while ((item = katze_array_get_nth_item (location_action->search_engines, i++))) + gtk_entry_completion_delete_action (completion, 0); + midori_location_action_add_actions (completion, search_engines); } @@ -1449,9 +1495,11 @@ void midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, const gchar* stock_id) { + #if !HAVE_HILDON GSList* proxies; GtkWidget* entry; GtkWidget* child; + #endif GtkStockItem stock_item; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index eba3477c..cb42c67c 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -369,6 +369,9 @@ static void midori_location_entry_init (MidoriLocationEntry* location_entry) { GtkWidget* entry; + #if HAVE_HILDON + HildonGtkInputMode mode; + #endif /* We want the widget to have appears-as-list applied */ gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" @@ -378,8 +381,13 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) location_entry->progress = 0.0; + #if HAVE_HILDON + entry = gtk_entry_new (); + mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry)); + mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP; + hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry), mode); + #else entry = gtk_icon_entry_new (); - #if !HAVE_HILDON gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 13680175..bb1af4e8 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -19,6 +19,12 @@ #include +#include "config.h" + +#ifdef HAVE_HILDON_2_2 + #include +#endif + struct _MidoriPanel { GtkHBox parent_instance; @@ -31,11 +37,13 @@ struct _MidoriPanel GtkWidget* frame; GtkWidget* toolbook; GtkWidget* notebook; + GtkActionGroup* action_group; GtkMenu* menu; gboolean show_titles; gboolean show_controls; gboolean right_aligned; + gboolean open_panels_in_windows; }; struct _MidoriPanelClass @@ -54,11 +62,13 @@ enum PROP_0, PROP_SHADOW_TYPE, + PROP_ACTION_GROUP, PROP_MENU, PROP_PAGE, PROP_SHOW_TITLES, PROP_SHOW_CONTROLS, PROP_RIGHT_ALIGNED, + PROP_OPEN_PANELS_IN_WINDOWS, }; enum { @@ -138,6 +148,23 @@ midori_panel_class_init (MidoriPanelClass* class) GTK_SHADOW_NONE, flags)); + /** + * MidoriWebSettings:action-group: + * + * This is the action group the panel will add actions + * corresponding to pages to. + * + * Since: 0.2.1 + */ + g_object_class_install_property (gobject_class, + PROP_ACTION_GROUP, + g_param_spec_object ( + "action-group", + "Action Group", + "The action group the panel will add actions to", + GTK_TYPE_ACTION_GROUP, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * MidoriWebSettings:menu: * @@ -212,6 +239,22 @@ midori_panel_class_init (MidoriPanelClass* class) "Whether the panel is aligned to the right", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + /** + * MidoriWebSettings:open-panels-in-windows: + * + * Whether to open panels in separate windows. + * + * Since: 0.2.2 + */ + g_object_class_install_property (gobject_class, + PROP_OPEN_PANELS_IN_WINDOWS, + g_param_spec_boolean ( + "open-panels-in-windows", + "Open panels in windows", + "Whether to open panels in standalone windows by default", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -241,6 +284,7 @@ midori_panel_detached_window_delete_event_cb (GtkWidget* window, GtkWidget* scrolled = g_object_get_data (G_OBJECT (window), "scrolled"); GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), "panel-toolbar"); GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); + GtkWidget* viewable = _midori_panel_child_for_scrolled (panel, scrolled); GtkToolItem* toolitem; gint n; @@ -252,15 +296,10 @@ midori_panel_detached_window_delete_event_cb (GtkWidget* window, gtk_container_remove (GTK_CONTAINER (vbox), scrolled); n = gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), scrolled, NULL); g_object_unref (scrolled); - toolitem = midori_panel_construct_tool_item (panel, - MIDORI_VIEWABLE (_midori_panel_child_for_scrolled (panel, scrolled))); + toolitem = midori_panel_construct_tool_item (panel, MIDORI_VIEWABLE (viewable)); if (menuitem) - { - gtk_widget_show (menuitem); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); - } midori_panel_set_current_page (panel, n); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); return FALSE; } @@ -274,13 +313,9 @@ midori_panel_widget_destroy_cb (GtkWidget* viewable, } static void -midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, - MidoriPanel* panel) +midori_panel_detach_page (MidoriPanel* panel, + gint n) { - /* FIXME: What happens when the browser is destroyed? */ - /* FIXME: What about multiple browsers? */ - /* FIXME: Should we remember if the child was detached? */ - gint n = midori_panel_get_current_page (panel); GtkToolItem* toolitem = gtk_toolbar_get_nth_item ( GTK_TOOLBAR (panel->toolbar), n); const gchar* title = gtk_tool_button_get_label (GTK_TOOL_BUTTON (toolitem)); @@ -288,26 +323,32 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, GTK_NOTEBOOK (panel->toolbook), n); GtkWidget* scrolled = gtk_notebook_get_nth_page ( GTK_NOTEBOOK (panel->notebook), n); - GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); - GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); GtkWidget* vbox = gtk_vbox_new (FALSE, 0); - g_object_set_data (G_OBJECT (window), "scrolled", scrolled); - gtk_window_set_title (GTK_WINDOW (window), title); + #if HAVE_HILDON + GtkWidget* window = hildon_window_new (); + hildon_program_add_window (hildon_program_get_instance (), HILDON_WINDOW (window)); + #else + GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); gtk_window_set_default_size (GTK_WINDOW (window), 250, 400); gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (gtk_widget_get_toplevel (panel->notebook))); + #endif gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (window), vbox); - if (menuitem) - gtk_widget_hide (menuitem); + g_object_set_data (G_OBJECT (window), "scrolled", scrolled); + gtk_window_set_title (GTK_WINDOW (window), title); g_signal_handlers_disconnect_by_func ( _midori_panel_child_for_scrolled (panel, scrolled), midori_panel_widget_destroy_cb, toolitem); gtk_container_remove (GTK_CONTAINER (panel->toolbar), GTK_WIDGET (toolitem)); g_object_ref (toolbar); gtk_container_remove (GTK_CONTAINER (panel->toolbook), toolbar); + #if HAVE_HILDON + hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (toolbar)); + #else gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0); + #endif g_object_unref (toolbar); g_object_set_data (G_OBJECT (scrolled), "panel-toolbar", toolbar); g_object_ref (scrolled); @@ -317,14 +358,24 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, midori_panel_set_current_page (panel, n > 0 ? n - 1 : 0); toolitem = gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), n > 0 ? n - 1 : 0); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); if (!gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) - gtk_widget_set_sensitive (toolbutton, FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (panel->button_detach), FALSE); g_signal_connect (window, "delete-event", G_CALLBACK (midori_panel_detached_window_delete_event_cb), panel); gtk_widget_show (window); } +static void +midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, + MidoriPanel* panel) +{ + /* FIXME: What happens when the browser is destroyed? */ + /* FIXME: What about multiple browsers? */ + /* FIXME: Should we remember if the child was detached? */ + gint n = midori_panel_get_current_page (panel); + midori_panel_detach_page (panel, n); +} + static void midori_panel_button_align_clicked_cb (GtkWidget* toolitem, MidoriPanel* panel) @@ -347,6 +398,7 @@ midori_panel_init (MidoriPanel* panel) GtkWidget* labelbar; GtkToolItem* toolitem; + panel->action_group = NULL; panel->show_titles = TRUE; panel->show_controls = TRUE; panel->right_aligned = FALSE; @@ -370,6 +422,7 @@ midori_panel_init (MidoriPanel* panel) toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (toolitem, TRUE); panel->toolbar_label = gtk_label_new (NULL); + gtk_label_set_ellipsize (GTK_LABEL (panel->toolbar_label), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (panel->toolbar_label), 0, 0.5); gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); @@ -454,6 +507,9 @@ midori_panel_set_property (GObject* object, gtk_frame_set_shadow_type (GTK_FRAME (panel->frame), g_value_get_enum (value)); break; + case PROP_ACTION_GROUP: + katze_object_assign (panel->action_group, g_value_dup_object (value)); + break; case PROP_MENU: katze_object_assign (panel->menu, g_value_dup_object (value)); break; @@ -462,9 +518,6 @@ midori_panel_set_property (GObject* object, break; case PROP_SHOW_TITLES: panel->show_titles = g_value_get_boolean (value); - #if HAVE_HILDON - panel->show_titles = TRUE; - #endif gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), panel->show_titles ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS); break; @@ -476,6 +529,9 @@ midori_panel_set_property (GObject* object, case PROP_RIGHT_ALIGNED: midori_panel_set_right_aligned (panel, g_value_get_boolean (value)); break; + case PROP_OPEN_PANELS_IN_WINDOWS: + panel->open_panels_in_windows = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -496,6 +552,9 @@ midori_panel_get_property (GObject* object, g_value_set_enum (value, gtk_frame_get_shadow_type (GTK_FRAME (panel->frame))); break; + case PROP_ACTION_GROUP: + g_value_set_object (value, panel->action_group); + break; case PROP_MENU: g_value_set_object (value, panel->menu); break; @@ -511,6 +570,9 @@ midori_panel_get_property (GObject* object, case PROP_RIGHT_ALIGNED: g_value_set_boolean (value, panel->right_aligned); break; + case PROP_OPEN_PANELS_IN_WINDOWS: + g_value_set_boolean (value, panel->open_panels_in_windows); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -581,50 +643,20 @@ midori_panel_set_right_aligned (MidoriPanel* panel, g_object_notify (G_OBJECT (panel), "right-aligned"); } -static void -midori_panel_menu_item_activate_cb (GtkWidget* widget, - MidoriPanel* panel) -{ - GtkWidget* child; - GtkToolItem* toolitem; - guint n; - - child = g_object_get_data (G_OBJECT (widget), "page"); - n = midori_panel_page_num (panel, child); - toolitem = gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), n); - - if (toolitem) - { - /* Unsetting the button before setting it ensures that - it will emit signals even if it was active before */ - GtkToggleToolButton* button = GTK_TOGGLE_TOOL_BUTTON (toolitem); - g_signal_handlers_block_by_func (widget, - midori_panel_menu_item_activate_cb, panel); - gtk_toggle_tool_button_set_active (button, FALSE); - gtk_toggle_tool_button_set_active (button, TRUE); - g_signal_handlers_unblock_by_func (widget, - midori_panel_menu_item_activate_cb, panel); - } - - midori_panel_set_current_page (panel, n); - g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); - gtk_widget_show (GTK_WIDGET (panel)); -} - /* Private function, used by MidoriBrowser */ /* static */ GtkWidget* midori_panel_construct_menu_item (MidoriPanel* panel, MidoriViewable* viewable) { - const gchar* stock_id; + GtkAction* action; GtkWidget* menuitem; - stock_id = midori_viewable_get_stock_id (viewable); - menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - gtk_widget_show (menuitem); + action = g_object_get_data (G_OBJECT (viewable), "midori-panel-action"); + menuitem = gtk_action_create_menu_item (action); g_object_set_data (G_OBJECT (menuitem), "page", viewable); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_panel_menu_item_activate_cb), panel); + + if (GTK_WIDGET_VISIBLE (viewable)) + gtk_widget_show (menuitem); return menuitem; } @@ -644,35 +676,23 @@ static GtkToolItem* midori_panel_construct_tool_item (MidoriPanel* panel, MidoriViewable* viewable) { - const gchar* label = midori_viewable_get_label (viewable); - const gchar* stock_id = midori_viewable_get_stock_id (viewable); - GtkToolItem* toolitem; - GtkWidget* image; - - toolitem = gtk_radio_tool_button_new_from_stock (NULL, stock_id); - g_object_set (toolitem, "group", - gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), 0), NULL); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); - if (label) - { - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); - } + GtkAction* action; + GtkWidget* toolitem; + + action = g_object_get_data (G_OBJECT (viewable), "midori-panel-action"); + toolitem = gtk_action_create_tool_item (action); g_object_set_data (G_OBJECT (toolitem), "page", viewable); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_panel_menu_item_activate_cb), panel); - gtk_widget_show_all (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), GTK_TOOL_ITEM (toolitem), -1); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_widget_destroy_cb), toolitem); if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) gtk_widget_set_sensitive (GTK_WIDGET (panel->button_detach), TRUE); - return toolitem; + return GTK_TOOL_ITEM (toolitem); } +#if !HAVE_HILDON static void midori_panel_show_titles_toggled_cb (GtkWidget* menuitem, MidoriPanel* panel) @@ -699,7 +719,6 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem, n = midori_panel_get_current_page (panel); viewable = midori_panel_get_nth_page (panel, n); menu = gtk_menu_new (); - #if !HAVE_HILDON menuitem = gtk_check_menu_item_new_with_mnemonic (_("Show panel _titles")); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), panel->show_titles); @@ -707,7 +726,6 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem, G_CALLBACK (midori_panel_show_titles_toggled_cb), panel); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - #endif menuitem = gtk_check_menu_item_new_with_mnemonic (_("Show operating _controls")); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), panel->show_controls); @@ -718,7 +736,35 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem, g_signal_emit_by_name (viewable, "populate-option-menu", menu); katze_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), - NULL, SOKOKE_MENU_POSITION_LEFT); + NULL, KATZE_MENU_POSITION_LEFT); +} +#endif + +static void +midori_panel_action_activate_cb (GtkRadioAction* action, + MidoriPanel* panel) +{ + GtkWidget* viewable = g_object_get_data (G_OBJECT (action), "viewable"); + gint n = midori_panel_page_num (panel, viewable); + + /* If the panel is detached, focus the window */ + if (n == -1) + { + GtkWidget* toplevel = gtk_widget_get_toplevel (viewable); + gtk_window_present (GTK_WINDOW (toplevel)); + return; + } + + if (panel->open_panels_in_windows + && gtk_radio_action_get_current_value (action) + == katze_object_get_int (action, "value")) + midori_panel_detach_page (panel, n); + else + { + midori_panel_set_current_page (panel, n); + g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); + gtk_widget_show (GTK_WIDGET (panel)); + } } /** @@ -735,6 +781,10 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem, * Since 0.1.3 destroying the @viewable implicitly removes * the page including the menu and eventual toolbar. * + * Since 0.2.1 a hidden @viewable will not be shown in the panel. + * + * Since 0.2.1 an action with an accelerator is created implicitly. + * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 @@ -748,8 +798,9 @@ midori_panel_append_page (MidoriPanel* panel, GtkWidget* widget; GtkWidget* toolbar; GtkToolItem* toolitem; - const gchar* label; guint n; + gchar* action_name; + GtkAction* action; g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), -1); @@ -778,25 +829,57 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); toolbar = midori_viewable_get_toolbar (viewable); + #if !HAVE_HILDON toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_PROPERTIES); gtk_tool_item_set_tooltip_text (toolitem, _("Options")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_options_clicked_cb), panel); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 0); gtk_widget_show (GTK_WIDGET (toolitem)); + #endif gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_widget_destroy_cb), toolbar); - n = midori_panel_page_num (panel, scrolled); - label = midori_viewable_get_label (viewable); + n = midori_panel_get_n_pages (panel) - 1; + /* FIXME: Use something better than the stock ID */ + action_name = g_strconcat ("PanelPage", + midori_viewable_get_stock_id (viewable), NULL); + action = (GtkAction*)gtk_radio_action_new (action_name, + midori_viewable_get_label (viewable), + NULL, midori_viewable_get_stock_id (viewable), n); + g_object_set_data (G_OBJECT (action), "viewable", viewable); + g_signal_connect (action, "activate", + G_CALLBACK (midori_panel_action_activate_cb), panel); + if (panel->action_group) + { + /* FIXME: For some reason the accelerator only works if a menuitem + is created, but not before that. */ + GtkWidget* toplevel = gtk_widget_get_toplevel (GTK_WIDGET (panel)); + GSList* groups = gtk_accel_groups_from_object (G_OBJECT (toplevel)); + gtk_action_set_accel_group (action, g_slist_nth_data (groups, 0)); + gtk_action_group_add_action_with_accel (panel->action_group, + action, NULL); + } + if (n > 0) + g_object_set (action, "group", g_object_get_data ( + G_OBJECT (midori_panel_get_nth_page (panel, 0)), + "midori-panel-action"), NULL); + g_object_set_data (G_OBJECT (viewable), "midori-panel-action", action); + g_free (action_name); g_object_set_data (G_OBJECT (viewable), "parent", scrolled); - midori_panel_construct_tool_item (panel, viewable); + toolitem = midori_panel_construct_tool_item (panel, viewable); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_viewable_destroy_cb), panel); + if (!GTK_WIDGET_VISIBLE (viewable)) + { + gtk_widget_hide (scrolled); + gtk_widget_hide (GTK_WIDGET (toolitem)); + } + return n; } @@ -925,6 +1008,8 @@ midori_panel_page_num (MidoriPanel* panel, * silently ignore the attempt to switch the page. * * Since 0.1.8 the "page" property is notifying changes. + * + * Since 0.2.1 switching to hidden pages fails silently. **/ void midori_panel_set_current_page (MidoriPanel* panel, @@ -938,6 +1023,8 @@ midori_panel_set_current_page (MidoriPanel* panel, { const gchar* label; + if (!GTK_WIDGET_VISIBLE (viewable)) + return; gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable)); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 82c19c45..d1645d9c 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -22,15 +22,18 @@ #include #include +#if HAVE_LIBNOTIFY + #include +#endif + struct _MidoriPreferences { - GtkDialog parent_instance; + KatzePreferences parent_instance; - MidoriWebSettings* settings; - GtkWidget* notebook; + gpointer settings; }; -G_DEFINE_TYPE (MidoriPreferences, midori_preferences, GTK_TYPE_DIALOG) +G_DEFINE_TYPE (MidoriPreferences, midori_preferences, KATZE_TYPE_PREFERENCES); enum { @@ -62,6 +65,11 @@ midori_preferences_class_init (MidoriPreferencesClass* class) gobject_class->set_property = midori_preferences_set_property; gobject_class->get_property = midori_preferences_get_property; + /** + * MidoriPreferences:settings: + * + * The settings to proxy properties from. + */ g_object_class_install_property (gobject_class, PROP_SETTINGS, g_param_spec_object ( @@ -72,38 +80,10 @@ midori_preferences_class_init (MidoriPreferencesClass* class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } -static void -midori_preferences_response_cb (MidoriPreferences* preferences, - gint response) -{ - if (response == GTK_RESPONSE_CLOSE) - gtk_widget_destroy (GTK_WIDGET (preferences)); -} - static void midori_preferences_init (MidoriPreferences* preferences) { - gchar* dialog_title; - preferences->settings = NULL; - preferences->notebook = NULL; - - dialog_title = g_strdup_printf (_("Preferences for %s"), - g_get_application_name ()); - g_object_set (preferences, - "icon-name", GTK_STOCK_PREFERENCES, - "title", dialog_title, - "has-separator", FALSE, - NULL); - g_free (dialog_title); - #if !HAVE_OSX - gtk_dialog_add_buttons (GTK_DIALOG (preferences), - GTK_STOCK_HELP, GTK_RESPONSE_HELP, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); - #endif - g_signal_connect (preferences, "response", - G_CALLBACK (midori_preferences_response_cb), NULL); } static void @@ -179,9 +159,17 @@ midori_preferences_new (GtkWindow* parent, return GTK_WIDGET (preferences); } +#if GTK_CHECK_VERSION (2, 16, 0) +static void +midori_preferences_homepage_icon_press_cb (GtkWidget* button, + GtkEntryIconPosition position, + GdkEvent* event, + MidoriWebSettings* settings) +#else static void midori_preferences_homepage_current_clicked_cb (GtkWidget* button, MidoriWebSettings* settings) +#endif { GtkWidget* preferences = gtk_widget_get_toplevel (button); GtkWidget* browser = katze_object_get_object (preferences, "transient-for"); @@ -194,53 +182,7 @@ midori_preferences_homepage_current_clicked_cb (GtkWidget* button, } } -static gboolean -proxy_download_manager_icon_cb (GtkWidget* entry, - GdkEventFocus* event, - GtkImage* icon) -{ - const gchar* command; - gchar* first_space; - gchar* first_part; - gchar* path; - - command = gtk_entry_get_text (GTK_ENTRY (entry)); - if ((first_space = strstr (command, " "))) - first_part = g_strndup (command, first_space - command); - else - first_part = g_strdup (command); - path = g_find_program_in_path (first_part); - - if (path) - { - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_for_screen ( - gtk_widget_get_screen (entry)), first_part)) - gtk_image_set_from_icon_name (icon, first_part, GTK_ICON_SIZE_MENU); - else - gtk_image_set_from_stock (icon, GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); - g_free (path); - } - else if (first_part && *first_part) - gtk_image_set_from_stock (icon, GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - else - gtk_image_clear (icon); - - g_free (first_part); - - return FALSE; -} - -static void -midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, - GParamSpec* pspec, - GtkWidget* entry) -{ - MidoriPreferredEncoding preferred_encoding; - - preferred_encoding = katze_object_get_enum (settings, "preferred-encoding"); - gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); -} - +#if !HAVE_HILDON static void midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -251,25 +193,9 @@ midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, !auto_detect_proxy); } - -static void -midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, - GParamSpec* pspec, - GtkWidget* entry) -{ - MidoriIdentity identify_as = katze_object_get_enum (settings, "identify-as"); - - gtk_widget_set_sensitive (entry, identify_as == MIDORI_IDENT_CUSTOM); -} +#endif #if HAVE_OSX -static void -midori_preferences_help_clicked_cb (GtkWidget* button, - GtkDialog* dialog) -{ - gtk_dialog_response (dialog, GTK_RESPONSE_HELP); -} - static void midori_preferences_toolbutton_clicked_cb (GtkWidget* toolbutton, GtkWidget* page) @@ -298,6 +224,28 @@ midori_preferences_add_toolbutton (GtkWidget* toolbar, #endif } +#if 0 +static void +midori_preferences_list_dicts_cb (const gchar* lang_tag, + const gchar* provider_name, + const gchar* provider_desc, + const gchar* provider_file, + GList** dicts) +{ + *dicts = g_list_prepend (*dicts, (gchar*)lang_tag); +} + +static GList* +midori_preferences_get_spell_languages (void) +{ + GList* dicts = NULL; + gpointer broker = enchant_broker_init (); + enchant_broker_list_dicts (broker, (GCallback)midori_preferences_list_dicts_cb, &dicts); + enchant_broker_free (broker); + return dicts; +} +#endif + /** * midori_preferences_set_settings: * @settings: the settings @@ -315,393 +263,262 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* header; GtkWindow* parent; const gchar* icon_name; - #if WEBKIT_CHECK_VERSION (1, 1, 15) - GtkSettings* gtk_settings; - #endif - GtkSizeGroup* sizegroup; - GtkWidget* toolbar; - GtkWidget* toolbutton; - GtkWidget* page; - GtkWidget* frame; - GtkWidget* table; - GtkWidget* align; + KatzePreferences* _preferences; GtkWidget* label; GtkWidget* button; GtkWidget* entry; - GtkWidget* hbox; - gint icon_width, icon_height; g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); - g_return_if_fail (!preferences->notebook); + g_return_if_fail (!preferences->settings); - katze_assign (preferences->settings, g_object_ref (settings)); + preferences->settings = settings; g_object_get (preferences, "transient-for", &parent, NULL); icon_name = parent ? gtk_window_get_icon_name (parent) : NULL; if ((header = sokoke_xfce_header_new (icon_name, gtk_window_get_title (GTK_WINDOW (preferences))))) + { gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), header, FALSE, FALSE, 0); - #if WEBKIT_CHECK_VERSION (1, 1, 15) - gtk_settings = parent ? gtk_widget_get_settings (GTK_WIDGET (parent)) : NULL; - #endif - - preferences->notebook = gtk_notebook_new (); - gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); - - #if HAVE_OSX - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (preferences->notebook), FALSE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (preferences->notebook), FALSE); - toolbar = gtk_toolbar_new (); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH); - gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), - toolbar, FALSE, FALSE, 0); - #else - toolbar = NULL; - #endif - toolbutton = NULL; + gtk_widget_show_all (header); + } + _preferences = KATZE_PREFERENCES (preferences); - sizegroup = NULL; #define PAGE_NEW(__icon, __label) \ - page = gtk_vbox_new (FALSE, 0); \ - midori_preferences_add_toolbutton (toolbar, &toolbutton, \ - __icon, __label, page); \ - if (toolbutton) g_object_set_data (G_OBJECT (toolbutton), \ - "notebook", preferences->notebook); \ - if (sizegroup) g_object_unref (sizegroup); \ - sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); \ - gtk_container_set_border_width (GTK_CONTAINER (page), 4); \ - gtk_notebook_append_page (GTK_NOTEBOOK (preferences->notebook), page, \ - gtk_label_new (__label)) - #define FRAME_NEW(__label) frame = sokoke_hig_frame_new (__label); \ - gtk_container_set_border_width (GTK_CONTAINER (frame), 4); \ - gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); - #define TABLE_NEW(__rows, __cols) table = gtk_table_new ( \ - __rows, __cols, FALSE); \ - gtk_container_set_border_width (GTK_CONTAINER (table), 4); \ - gtk_container_add (GTK_CONTAINER (frame), table); - #define WIDGET_ADD(__widget, __left, __right, __top, __bottom) \ - gtk_table_attach (GTK_TABLE (table), __widget \ - , __left, __right, __top, __bottom \ - , GTK_FILL, GTK_FILL, 8, 2) - #define FILLED_ADD(__widget, __left, __right, __top, __bottom) \ - gtk_table_attach (GTK_TABLE (table), __widget \ - , __left, __right, __top, __bottom\ - , GTK_EXPAND | GTK_FILL, GTK_FILL, 8, 2) - #define INDENTED_ADD(__widget, __left, __right, __top, __bottom) \ - align = gtk_alignment_new (0, 0.5, 0, 0); \ - gtk_container_add (GTK_CONTAINER (align), __widget); \ - gtk_size_group_add_widget (sizegroup, align); \ - WIDGET_ADD (align, __left, __right, __top, __bottom) - #define SPANNED_ADD(__widget, __left, __right, __top, __bottom) \ - align = gtk_alignment_new (0, 0.5, 0, 0); \ - gtk_container_add (GTK_CONTAINER (align), __widget); \ - FILLED_ADD (align, __left, __right, __top, __bottom) + katze_preferences_add_category (_preferences, __label, __icon) + #define FRAME_NEW(__label) \ + katze_preferences_add_group (_preferences, __label) + #define FILLED_ADD(__widget) \ + katze_preferences_add_widget (_preferences, __widget, "filled") + #define INDENTED_ADD(__widget) \ + katze_preferences_add_widget (_preferences, __widget, "indented") + #define SPANNED_ADD(__widget) \ + katze_preferences_add_widget (_preferences, __widget, "spanned") /* Page "General" */ PAGE_NEW (GTK_STOCK_HOME, _("General")); FRAME_NEW (_("Startup")); - TABLE_NEW (3, 2); label = katze_property_label (settings, "load-on-startup"); - INDENTED_ADD (label, 0, 1, 0, 1); + INDENTED_ADD (label); button = katze_property_proxy (settings, "load-on-startup", NULL); - FILLED_ADD (button, 1, 2, 0, 1); + SPANNED_ADD (button); label = katze_property_label (settings, "homepage"); - INDENTED_ADD (label, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); + INDENTED_ADD (label); entry = katze_property_proxy (settings, "homepage", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + SPANNED_ADD (entry); if (parent && katze_object_has_property (parent, "uri")) { + #if GTK_CHECK_VERSION (2, 16, 0) + gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_JUMP_TO); + gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, _("Use current page as homepage")); + g_signal_connect (entry, "icon-press", + G_CALLBACK (midori_preferences_homepage_icon_press_cb), settings); + #else button = gtk_button_new (); label = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), label); gtk_widget_set_tooltip_text (button, _("Use current page as homepage")); g_signal_connect (button, "clicked", G_CALLBACK (midori_preferences_homepage_current_clicked_cb), settings); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + SPANNED_ADD (button); + #endif } - FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", NULL); - INDENTED_ADD (button, 0, 1, 2, 3); + INDENTED_ADD (button); button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); - FILLED_ADD (button, 1, 2, 2, 3); + SPANNED_ADD (button); FRAME_NEW (_("Transfers")); - TABLE_NEW (2, 2); + #if !HAVE_HILDON label = katze_property_label (settings, "download-folder"); - INDENTED_ADD (label, 0, 1, 0, 1); + INDENTED_ADD (label); button = katze_property_proxy (settings, "download-folder", "folder"); - FILLED_ADD (button, 1, 2, 0, 1); + SPANNED_ADD (button); label = katze_property_proxy (settings, "ask-for-destination-folder", NULL); - INDENTED_ADD (label, 0, 1, 1, 2); - button = katze_property_proxy (settings, "notify-transfer-completed", NULL); - /* FIXME: Disable the option if notifications presumably cannot be sent - gtk_widget_set_sensitive (button, FALSE); */ - SPANNED_ADD (button, 1, 2, 1, 2); + INDENTED_ADD (label); + #if HAVE_LIBNOTIFY + if (notify_is_initted () || g_find_program_in_path ("notify-send")) + { + button = katze_property_proxy (settings, "notify-transfer-completed", NULL); + SPANNED_ADD (button); + } + #endif + #endif /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); FRAME_NEW (_("Font settings")); - TABLE_NEW (7, 2); + #if !HAVE_HILDON label = gtk_label_new (_("Default Font Family")); - INDENTED_ADD (label, 0, 1, 0, 1); - hbox = gtk_hbox_new (FALSE, 4); + INDENTED_ADD (label); button = katze_property_proxy (settings, "default-font-family", "font"); gtk_widget_set_tooltip_text (button, _("The default font family used to display text")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + SPANNED_ADD (button); entry = katze_property_proxy (settings, "default-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The default font size used to display text")); - gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); - FILLED_ADD (hbox, 1, 2, 0, 1); + SPANNED_ADD (entry); label = gtk_label_new (_("Fixed-width Font Family")); - INDENTED_ADD (label, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); + INDENTED_ADD (label); button = katze_property_proxy (settings, "monospace-font-family", "font-monospace"); gtk_widget_set_tooltip_text (button, _("The font family used to display fixed-width text")); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + SPANNED_ADD (button); entry = katze_property_proxy (settings, "default-monospace-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The font size used to display fixed-width text")); - gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); - INDENTED_ADD (hbox, 1, 2, 1, 2); + SPANNED_ADD (entry); label = gtk_label_new (_("Minimum Font Size")); - INDENTED_ADD (label, 0, 1, 2, 3); + INDENTED_ADD (label); entry = katze_property_proxy (settings, "minimum-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text")); - INDENTED_ADD (entry, 1, 2, 2, 3); + SPANNED_ADD (entry); + #endif label = katze_property_label (settings, "preferred-encoding"); - INDENTED_ADD (label, 0, 1, 3, 4); - button = katze_property_proxy (settings, "preferred-encoding", NULL); - FILLED_ADD (button, 1, 2, 3, 4); - label = katze_property_label (settings, "default-encoding"); - gtk_label_set_label (GTK_LABEL (label), _("Encoding")); - INDENTED_ADD (label, 0, 1, 4, 5); - entry = katze_property_proxy (settings, "default-encoding", NULL); - gtk_widget_set_tooltip_text (entry, _("The character encoding to use by default")); - g_signal_connect (settings, "notify::preferred-encoding", - G_CALLBACK (midori_preferences_notify_preferred_encoding_cb), entry); - midori_preferences_notify_preferred_encoding_cb (settings, NULL, entry); - FILLED_ADD (entry, 1, 2, 4, 5); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "preferred-encoding", "custom-default-encoding"); + SPANNED_ADD (button); /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); FRAME_NEW (_("Features")); - TABLE_NEW (6, 2); + #if !HAVE_HILDON button = katze_property_proxy (settings, "auto-load-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); - gtk_widget_set_tooltip_text (button, _("Load and display images automatically")); - INDENTED_ADD (button, 0, 1, 0, 1); - #if WEBKIT_CHECK_VERSION (1, 1, 15) - if (katze_object_get_boolean (gtk_settings, "gtk-touchscreen-mode")) + INDENTED_ADD (button); + #endif + #if WEBKIT_CHECK_VERSION (1, 1, 15) || HAVE_HILDON + if (katze_widget_has_touchscreen_mode (parent ? + GTK_WIDGET (parent) : GTK_WIDGET (preferences))) button = katze_property_proxy (settings, "kinetic-scrolling", NULL); else - { - button = katze_property_proxy (settings, "auto-shrink-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically")); - gtk_widget_set_tooltip_text (button, _("Automatically shrink standalone images to fit")); - } + button = katze_property_proxy (settings, "open-panels-in-windows", NULL); #else button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); #endif - SPANNED_ADD (button, 1, 2, 0, 1); + SPANNED_ADD (button); + #if !HAVE_HILDON button = katze_property_proxy (settings, "enable-scripts", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); - gtk_widget_set_tooltip_text (button, _("Enable embedded scripting languages")); - INDENTED_ADD (button, 0, 1, 2, 3); + INDENTED_ADD (button); button = katze_property_proxy (settings, "enable-plugins", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins")); - gtk_widget_set_tooltip_text (button, _("Enable embedded Netscape plugin objects")); - SPANNED_ADD (button, 1, 2, 2, 3); + SPANNED_ADD (button); button = katze_property_proxy (settings, "enforce-96-dpi", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch")); gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI")); - SPANNED_ADD (button, 0, 1, 3, 4); + INDENTED_ADD (button); button = katze_property_proxy (settings, "enable-developer-extras", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); gtk_widget_set_tooltip_text (button, _("Enable special extensions for developers")); - SPANNED_ADD (button, 1, 2, 3, 4); + SPANNED_ADD (button); + #endif button = katze_property_proxy (settings, "zoom-text-and-images", NULL); - SPANNED_ADD (button, 0, 1, 4, 5); + INDENTED_ADD (button); button = katze_property_proxy (settings, "find-while-typing", NULL); - SPANNED_ADD (button, 1, 2, 4, 5); + SPANNED_ADD (button); #if WEBKIT_CHECK_VERSION (1, 1, 6) FRAME_NEW (_("Spell Checking")); - TABLE_NEW (1, 2); + /* FIXME: Provide a nice dictionary selection */ button = katze_property_proxy (settings, "enable-spell-checking", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing")); - INDENTED_ADD (button, 0, 1, 0, 1); + INDENTED_ADD (button); entry = katze_property_proxy (settings, "spell-checking-languages", NULL); /* i18n: The example should be adjusted to contain a good local default */ - gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"")); - FILLED_ADD (entry, 1, 2, 0, 1); + gtk_widget_set_tooltip_text (entry, _("A comma separated list of " + "languages to be used for spell checking, for example \"en_GB,de_DE\"")); + SPANNED_ADD (entry); #endif /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (2, 2); #if !HAVE_HILDON - INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); + INDENTED_ADD (katze_property_label (settings, "toolbar-style")); button = katze_property_proxy (settings, "toolbar-style", NULL); - FILLED_ADD (button, 1, 2, 0, 1); - #endif + SPANNED_ADD (button); button = katze_property_proxy (settings, "progress-in-location", NULL); - FILLED_ADD (button, 0, 1, 1, 2); + INDENTED_ADD (button); button = katze_property_proxy (settings, "search-engines-in-completion", NULL); - FILLED_ADD (button, 1, 2, 1, 2); + SPANNED_ADD (button); + #endif FRAME_NEW (_("Browsing")); - TABLE_NEW (5, 2); - hbox = gtk_hbox_new (FALSE, 4); label = katze_property_label (settings, "open-new-pages-in"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); + INDENTED_ADD (label); button = katze_property_proxy (settings, "open-new-pages-in", NULL); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - INDENTED_ADD (hbox, 0, 1, 0, 1); - hbox = gtk_hbox_new (FALSE, 4); + SPANNED_ADD (button); label = katze_property_label (settings, "open-external-pages-in"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); + INDENTED_ADD (label); button = katze_property_proxy (settings, "open-external-pages-in", NULL); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - FILLED_ADD (hbox, 1, 2, 0, 1); + SPANNED_ADD (button); + #if !HAVE_HILDON button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); - INDENTED_ADD (button, 1, 2, 2, 3); - button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); - WIDGET_ADD (button, 0, 1, 5, 6); + INDENTED_ADD (button); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); - WIDGET_ADD (button, 1, 2, 5, 6); + SPANNED_ADD (button); + #endif + button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); + INDENTED_ADD (button); + button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); + SPANNED_ADD (button); + #if !HAVE_HILDON /* Page "Applications" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Applications")); FRAME_NEW (_("External applications")); - TABLE_NEW (3, 2); label = katze_property_label (settings, "text-editor"); - INDENTED_ADD (label, 0, 1, 0, 1); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "text-editor", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 0, 1); + INDENTED_ADD (label); + entry = katze_property_proxy (settings, "text-editor", "application-text/plain"); + SPANNED_ADD (entry); label = katze_property_label (settings, "download-manager"); - INDENTED_ADD (label, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "download-manager", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 1, 2); + INDENTED_ADD (label); + entry = katze_property_proxy (settings, "download-manager", "application-Network"); + SPANNED_ADD (entry); label = katze_property_label (settings, "news-aggregator"); - INDENTED_ADD (label, 0, 1, 2, 3); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "news-aggregator", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 2, 3); + INDENTED_ADD (label); + entry = katze_property_proxy (settings, "news-aggregator", "application-News"); + SPANNED_ADD (entry); + #endif /* Page "Network" */ PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); - TABLE_NEW (5, 2); + #if !HAVE_HILDON label = katze_property_label (settings, "http-proxy"); - INDENTED_ADD (label, 0, 1, 0, 1); + INDENTED_ADD (label); entry = katze_property_proxy (settings, "http-proxy", NULL); - FILLED_ADD (entry, 1, 2, 0, 1); + SPANNED_ADD (entry); + INDENTED_ADD (gtk_event_box_new ()); button = katze_property_proxy (settings, "auto-detect-proxy", NULL); - FILLED_ADD (button, 1, 2, 1, 2); + SPANNED_ADD (button); g_signal_connect (settings, "notify::auto-detect-proxy", G_CALLBACK (midori_preferences_notify_auto_detect_proxy_cb), entry); midori_preferences_notify_auto_detect_proxy_cb (settings, NULL, entry); + #endif label = katze_property_label (settings, "identify-as"); - INDENTED_ADD (label, 0, 1, 2, 3); - button = katze_property_proxy (settings, "identify-as", NULL); - FILLED_ADD (button, 1, 2, 2, 3); - label = katze_property_label (settings, "ident-string"); - INDENTED_ADD (label, 0, 1, 3, 4); - entry = katze_property_proxy (settings, "ident-string", NULL); - g_signal_connect (settings, "notify::identify-as", - G_CALLBACK (midori_preferences_notify_identify_as_cb), entry); - midori_preferences_notify_identify_as_cb (settings, NULL, entry); - FILLED_ADD (entry, 1, 2, 3, 4); - label = katze_property_label (settings, "cache-size"); - INDENTED_ADD (label, 0, 1, 4, 5); - hbox = gtk_hbox_new (FALSE, 4); - entry = katze_property_proxy (settings, "cache-size", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), - FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 4, 5); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "identify-as", "custom-ident-string"); + SPANNED_ADD (button); /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); FRAME_NEW (_("Web Cookies")); - TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); - INDENTED_ADD (label, 0, 1, 0, 1); + INDENTED_ADD (label); button = katze_property_proxy (settings, "accept-cookies", NULL); - FILLED_ADD (button, 1, 2, 0, 1); + SPANNED_ADD (button); button = katze_property_proxy (settings, "original-cookies-only", NULL); - SPANNED_ADD (button, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); + INDENTED_ADD (button); label = katze_property_label (settings, "maximum-cookie-age"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + INDENTED_ADD (label); entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), - FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 1, 2); + SPANNED_ADD (entry); + label = gtk_label_new (_("days")); + SPANNED_ADD (label); FRAME_NEW (_("History")); - TABLE_NEW (3, 2); - button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); - SPANNED_ADD (button, 0, 1, 0, 1); - hbox = gtk_hbox_new (FALSE, 4); + button = katze_property_label (settings, "maximum-history-age"); + INDENTED_ADD (button); button = katze_property_proxy (settings, "maximum-history-age", NULL); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), - FALSE, FALSE, 0); - SPANNED_ADD (hbox, 1, 2, 0, 1); - button = katze_property_proxy (settings, "remember-last-form-inputs", NULL); - SPANNED_ADD (button, 0, 2, 1, 2); + SPANNED_ADD (button); + label = gtk_label_new (_("days")); + SPANNED_ADD (label); button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); - SPANNED_ADD (button, 0, 2, 2, 3); - - g_object_unref (sizegroup); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), - preferences->notebook, FALSE, FALSE, 4); - #if HAVE_OSX - GtkWidget* icon; - hbox = gtk_hbox_new (FALSE, 0); - button = gtk_button_new (); - icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), icon); - g_signal_connect (button, "clicked", - G_CALLBACK (midori_preferences_help_clicked_cb), preferences); - gtk_box_pack_end (GTK_BOX (hbox), - button, FALSE, FALSE, 4); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->vbox), - hbox, FALSE, FALSE, 0); - #endif - gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); + INDENTED_ADD (button); } diff --git a/midori/midori-preferences.h b/midori/midori-preferences.h index 9015d952..3b4ca2ed 100644 --- a/midori/midori-preferences.h +++ b/midori/midori-preferences.h @@ -14,8 +14,6 @@ #include "midori-websettings.h" -#include - #include G_BEGIN_DECLS @@ -38,7 +36,7 @@ typedef struct _MidoriPreferencesClass MidoriPreferencesClass; struct _MidoriPreferencesClass { - GtkDialogClass parent_class; + KatzePreferencesClass parent_class; }; GType diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 816f1e1b..b469ce54 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -407,9 +407,9 @@ midori_search_action_manage_activate_cb (GtkWidget* menuitem, /* Private function, used by MidoriView */ /* static */ GdkPixbuf* -midori_search_action_get_icon (KatzeNet* net, - KatzeItem* item, - GtkWidget* widget) +midori_search_action_get_icon (KatzeItem* item, + GtkWidget* widget, + const gchar** icon_name) { const gchar* icon; @@ -417,25 +417,21 @@ midori_search_action_get_icon (KatzeNet* net, { GdkScreen* screen; GtkIconTheme* icon_theme; - gint width, height; - GdkPixbuf* pixbuf; - if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget)))) - return gtk_widget_render_icon (widget, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); + screen = gtk_widget_get_screen (widget); icon_theme = gtk_icon_theme_get_for_screen (screen); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), - GTK_ICON_SIZE_MENU, &width, &height); - if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height), - GTK_ICON_LOOKUP_USE_BUILTIN, NULL))) - return pixbuf; + if (gtk_icon_theme_has_icon (icon_theme, icon)) + *icon_name = icon; + else + *icon_name = GTK_STOCK_FILE; + return NULL; } if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://"))) - return katze_net_load_icon (net, icon, NULL, widget, NULL); + return katze_load_cached_icon (icon, widget); - return gtk_widget_render_icon (widget, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); + *icon_name = GTK_STOCK_FILE; + return NULL; } static void @@ -463,13 +459,20 @@ midori_search_action_icon_released_cb (GtkWidget* entry, { do { + const gchar* icon_name; + menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); - icon = midori_search_action_get_icon ( - MIDORI_SEARCH_ACTION (action)->net, item, entry); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); - g_object_unref (icon); + icon = midori_search_action_get_icon (item, entry, &icon_name); + if (icon) + { + gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); + g_object_unref (icon); + } + else + gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, + GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( @@ -501,8 +504,7 @@ midori_search_action_icon_released_cb (GtkWidget* entry, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_search_action_manage_activate_cb), action); gtk_widget_show (menuitem); - sokoke_widget_popup (entry, GTK_MENU (menu), - NULL, SOKOKE_MENU_POSITION_LEFT); + katze_widget_popup (entry, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT); } static gboolean @@ -525,11 +527,19 @@ midori_search_action_set_entry_icon (MidoriSearchAction* search_action, if (search_action->current_item) { - icon = midori_search_action_get_icon (search_action->net, - search_action->current_item, entry); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - g_object_unref (icon); + const gchar* icon_name; + + icon = midori_search_action_get_icon (search_action->current_item, + entry, &icon_name); + if (icon) + { + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + g_object_unref (icon); + } + else + gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon_name); sokoke_entry_set_default_text (GTK_ENTRY (entry), katze_item_get_name (search_action->current_item)); } @@ -819,13 +829,18 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, KatzeItem* item; MidoriSearchAction* search_action; GdkPixbuf* icon; + const gchar* icon_name; gtk_tree_model_get (model, iter, 0, &item, -1); search_action = g_object_get_data (G_OBJECT (treeview), "search-action"); - icon = midori_search_action_get_icon (search_action->net, item, treeview); - g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); - g_object_unref (icon); + if ((icon = midori_search_action_get_icon (item, treeview, &icon_name))) + { + g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); + g_object_unref (icon); + } + else + g_object_set (renderer, "icon-name", icon_name, "yalign", 0.25, NULL); g_object_unref (item); } @@ -1016,6 +1031,10 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, if (new_engine) katze_array_add_item (search_action->search_engines, item); + /* If it isn't a new search engine but the old default one, + we need to update the default search engine after editing it. */ + else if (item == midori_search_action_get_default_item (search_action)) + midori_search_action_set_default_item (search_action, item); } gtk_widget_destroy (dialog); } @@ -1217,7 +1236,9 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) toplevel ? GTK_WINDOW (toplevel) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, #if !HAVE_OSX + #if !HAVE_HILDON GTK_STOCK_HELP, GTK_RESPONSE_HELP, + #endif GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 5e5f86aa..8dad8953 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -30,7 +30,7 @@ #define STOCK_STYLE "gnome-settings-theme" #define STOCK_TRANSFER "package" #define STOCK_TRANSFERS "package" -#define STOCK_PLUGINS GTK_STOCK_CONVERT +#define STOCK_PLUGINS "gnome-mime-application-x-shockwave-flash" #define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME @@ -43,4 +43,13 @@ #define STOCK_USER_TRASH "gnome-stock-trash" #define STOCK_WINDOW_NEW "stock_new-window" +#if defined (HAVE_HILDON) && HAVE_HILDON + #undef STOCK_BOOKMARKS + #define STOCK_BOOKMARKS "general_mybookmarks_folder" + #undef STOCK_NEWS_FEED + #define STOCK_NEWS_FEED "general_rss" + #undef STOCK_WEB_BROWSER + #define STOCK_WEB_BROWSER "general_web" +#endif + #endif /* !__MIDORI_STOCK_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c index 0890abf0..31876a2b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -40,18 +40,13 @@ webkit_web_frame_print (WebKitWebFrame* web_frame); #endif GdkPixbuf* -midori_search_action_get_icon (KatzeNet* net, - KatzeItem* item, - GtkWidget* widget); +midori_search_action_get_icon (KatzeItem* item, + GtkWidget* widget, + const gchar** icon_name); static void midori_view_construct_web_view (MidoriView* view); -GdkPixbuf* -midori_view_get_snapshot (MidoriView* view, - gint width, - gint height); - static void midori_view_item_meta_data_changed (KatzeItem* item, const gchar* key, @@ -625,8 +620,8 @@ midori_view_update_icon (MidoriView* view, if (!icon) { GdkScreen* screen; - GtkIconTheme* icon_theme; - gchar** parts; + GtkIconTheme* icon_theme = NULL; + gchar** parts = NULL; gchar* icon_name; if ((screen = gtk_widget_get_screen (GTK_WIDGET (view)))) @@ -638,8 +633,6 @@ midori_view_update_icon (MidoriView* view, katze_assign (parts, NULL); } } - else - parts = NULL; if (parts) icon = midori_view_mime_icon (icon_theme, "%s-%s", @@ -713,12 +706,14 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view MidoriView* view) { const gchar* uri = webkit_network_request_get_uri (request); - if (g_str_has_prefix (uri, "mailto:")) + if (g_str_has_prefix (uri, "mailto:") || g_str_has_prefix (uri, "tel:")) { - webkit_web_policy_decision_ignore (decision); - sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)), - uri, GDK_CURRENT_TIME, NULL); - return TRUE; + if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)), + uri, GDK_CURRENT_TIME, NULL)) + { + webkit_web_policy_decision_ignore (decision); + return TRUE; + } } /* TODO: Handle more external protocols */ return FALSE; @@ -818,6 +813,71 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view, } #if WEBKIT_CHECK_VERSION (1, 1, 6) +#if WEBKIT_CHECK_VERSION (1, 1, 14) +static void +midori_view_web_view_resource_request_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + WebKitWebResource* web_resource, + WebKitNetworkRequest* request, + WebKitNetworkResponse* response, + MidoriView* view) +{ + const gchar* uri = webkit_network_request_get_uri (request); + + /* Only apply custom URIs to special pages for security purposes */ + if (!webkit_web_data_source_get_unreachable_uri ( + webkit_web_frame_get_data_source (web_frame))) + return; + + if (g_str_has_prefix (uri, "res://")) + { + gchar* filename = g_build_filename ("midori/res", &uri[5], NULL); + gchar* filepath = sokoke_find_data_filename (filename); + gchar* file_uri; + + g_free (filename); + file_uri = g_filename_to_uri (filepath, NULL, NULL); + g_free (filepath); + webkit_network_request_set_uri (request, file_uri); + g_free (file_uri); + } + else if (g_str_has_prefix (uri, "stock://")) + { + GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); + const gchar* icon_name = &uri[8] ? &uri[8] : ""; + gint icon_size = 22; + GtkIconInfo* info; + + if (g_ascii_isalpha (icon_name[0])) + icon_size = strstr (icon_name, "dialog") ? 48 : 22; + else if (g_ascii_isdigit (icon_name[0])) + { + guint i = 0; + while (icon_name[i]) + if (icon_name[i++] == '/') + { + gchar* size = g_strndup (icon_name, i - 1); + icon_size = atoi (size); + g_free (size); + icon_name = &icon_name[i]; + } + } + + if ((info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, icon_size, 0))) + { + const gchar* filename = gtk_icon_info_get_filename (info); + if (filename) + { + gchar* file_uri = g_filename_to_uri (filename, NULL, NULL); + webkit_network_request_set_uri (request, file_uri); + g_free (file_uri); + } + gtk_icon_info_free (info); + } + } +} +#endif + static gboolean webkit_web_view_load_error_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, @@ -832,18 +892,25 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, g_free (template_file); if (g_file_get_contents (path, &template, NULL, NULL)) { + #if !WEBKIT_CHECK_VERSION (1, 1, 14) SoupServer* res_server; guint port; + #endif gchar* res_root; gchar* stock_root; gchar* title; gchar* message; gchar* result; + #if WEBKIT_CHECK_VERSION (1, 1, 14) + res_root = g_strdup ("res:/"); + stock_root = g_strdup ("stock:/"); + #else res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); stock_root = g_strdup_printf ("http://localhost:%d/stock", port); + #endif title = g_strdup_printf (_("Error - %s"), uri); message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); @@ -952,13 +1019,13 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, URI1|title1,URI2|title2 FIXME: Ensure separators contained in the string can't break it */ gchar* value = sokoke_js_script_eval (js_context, - "function links (l) { var f = new Array (); for (i in l) " + "(function (l) { var f = new Array (); for (i in l) " "{ var t = l[i].type; var r = l[i].rel; " "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) " "f.push (l[i].href + '|' + l[i].title);" "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); } " - "return f; }" - "links (document.getElementsByTagName ('link'))", NULL); + "return f; })(" + "document.getElementsByTagName ('link'));", NULL); gchar** items = g_strsplit (value, ",", 0); guint i = 0; gchar* default_uri = NULL; @@ -1193,14 +1260,22 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, clipboard = gtk_clipboard_get_for_display ( gtk_widget_get_display (GTK_WIDGET (view)), GDK_SELECTION_PRIMARY); - uri = gtk_clipboard_wait_for_text (clipboard); - if (uri && strchr (uri, '.')) + if ((uri = gtk_clipboard_wait_for_text (clipboard))) { + KatzeArray* empty_array = katze_array_new (KATZE_TYPE_ITEM); guint i = 0; while (uri[i++] != '\0') if (uri[i] == '\n' || uri[i] == '\r') uri[i] = ' '; - new_uri = sokoke_magic_uri (g_strstrip (uri), NULL); + new_uri = sokoke_magic_uri (g_strstrip (uri), empty_array); + g_object_unref (empty_array); + if (!new_uri) + { + gchar* search; + g_object_get (view->settings, "location-entry-search", + &search, NULL); + new_uri = sokoke_search_uri (search, uri); + } if (event->state & GDK_CONTROL_MASK) { background = view->open_tabs_in_the_background; @@ -1294,6 +1369,19 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view, } #if WEBKIT_CHECK_VERSION (1, 1, 15) +static void +midori_web_view_set_clipboard (GtkWidget* widget, + const gchar* text) +{ + GdkDisplay* display = gtk_widget_get_display (widget); + GtkClipboard* clipboard; + + clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text (clipboard, text, -1); + clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text (clipboard, text, -1); +} + static void midori_web_view_menu_open_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1312,10 +1400,7 @@ static void midori_web_view_menu_link_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - GdkDisplay* display = gtk_widget_get_display (widget); - GtkClipboard* clipboard = gtk_clipboard_get_for_display (display, - GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, view->link_uri, -1); + midori_web_view_set_clipboard (widget, view->link_uri); } static void @@ -1356,11 +1441,8 @@ static void midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - GdkDisplay* display = gtk_widget_get_display (widget); - GtkClipboard* clipboard = gtk_clipboard_get_for_display (display, - GDK_SELECTION_CLIPBOARD); gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - gtk_clipboard_set_text (clipboard, uri, -1); + midori_web_view_set_clipboard (widget, uri); g_free (uri); } @@ -1385,11 +1467,8 @@ static void midori_web_view_menu_video_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - GdkDisplay* display = gtk_widget_get_display (widget); - GtkClipboard* clipboard = gtk_clipboard_get_for_display (display, - GDK_SELECTION_CLIPBOARD); gchar* uri = katze_object_get_string (view->hit_test, "media-uri"); - gtk_clipboard_set_text (clipboard, uri, -1); + midori_web_view_set_clipboard (widget, uri); g_free (uri); } @@ -1415,7 +1494,7 @@ midori_web_view_menu_video_download_activate_cb (GtkWidget* widget, MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "media-uri"); - sokoke_spawn_program (view->download_manager, uri, TRUE); + sokoke_spawn_program (view->download_manager, uri, FALSE); g_free (uri); } #endif @@ -1447,6 +1526,16 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, } } +#if WEBKIT_CHECK_VERSION (1, 1, 15) +static void +midori_web_view_menu_background_tab_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri, + !view->open_tabs_in_the_background); +} +#endif + static void midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1473,10 +1562,7 @@ static void midori_web_view_menu_copy_activate_cb (GtkWidget* widget, MidoriView* view) { - GdkDisplay* display = gtk_widget_get_display (widget); - GtkClipboard* clipboard = gtk_clipboard_get_for_display (display, - GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, view->selected_text, -1); + midori_web_view_set_clipboard (widget, view->selected_text); } #endif @@ -1493,7 +1579,7 @@ static void midori_web_view_menu_download_activate_cb (GtkWidget* widget, MidoriView* view) { - sokoke_spawn_program (view->download_manager, view->link_uri, TRUE); + sokoke_spawn_program (view->download_manager, view->link_uri, FALSE); } static void @@ -1655,6 +1741,11 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, midori_view_insert_menu_item (menu_shell, -1, _("Open Link in New _Tab"), STOCK_TAB_NEW, G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget); + midori_view_insert_menu_item (menu_shell, -1, + view->open_tabs_in_the_background + ? _("Open Link in _Foreground Tab") + : _("Open Link in _Background Tab"), STOCK_TAB_NEW, + G_CALLBACK (midori_web_view_menu_background_tab_activate_cb), widget); midori_view_insert_menu_item (menu_shell, -1, _("Open Link in New _Window"), STOCK_WINDOW_NEW, G_CALLBACK (midori_web_view_menu_new_window_activate_cb), widget); @@ -1767,11 +1858,18 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, while ((item = katze_array_get_nth_item (search_engines, i++))) { GdkPixbuf* pixbuf; + const gchar* icon_name; + menuitem = gtk_image_menu_item_new_with_mnemonic (katze_item_get_name (item)); - pixbuf = midori_search_action_get_icon (view->net, item, - GTK_WIDGET (web_view)); - icon = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); + pixbuf = midori_search_action_get_icon (item, + GTK_WIDGET (web_view), &icon_name); + if (pixbuf) + { + icon = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + } + else + icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( @@ -1807,7 +1905,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_strstrip (view->selected_text); if (view->selected_text && !strchr (view->selected_text, ' ') - && strchr (view->selected_text, '.')) + && (strchr (view->selected_text, '.') || g_strstr_len (view->selected_text, 9, "://"))) { if (strchr (view->selected_text, '@')) { @@ -1894,12 +1992,14 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, gtk_menu_shell_append (menu_shell, menuitem); } + #if !HAVE_HILDON menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "ZoomIn")); gtk_menu_shell_append (menu_shell, menuitem); menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "ZoomOut")); gtk_menu_shell_append (menu_shell, menuitem); + #endif menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "Encoding")); @@ -1911,6 +2011,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, { "EncodingAutomatic" }, { "EncodingChinese" }, { "EncodingJapanese" }, + { "EncodingKorean" }, { "EncodingRussian" }, { "EncodingUnicode" }, { "EncodingWestern" }, @@ -1928,7 +2029,18 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, } } - #if !HAVE_HILDON + #if HAVE_HILDON + gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ()); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "CompactAdd")); + gtk_menu_shell_append (menu_shell, menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "Fullscreen")); + gtk_menu_shell_append (menu_shell, menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "PrivateBrowsing")); + gtk_menu_shell_append (menu_shell, menuitem); + #else gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ()); menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "BookmarkAdd")); @@ -1943,6 +2055,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, menuitem = sokoke_action_create_popup_menu_item ( gtk_action_group_get_action (actions, "AddDesktopShortcut")); gtk_menu_shell_append (menu_shell, menuitem); + gtk_widget_set_no_show_all (menuitem, TRUE); #endif menuitem = sokoke_action_create_popup_menu_item ( @@ -1994,6 +2107,12 @@ webkit_web_view_web_view_ready_cb (GtkWidget* web_view, { GtkWidget* new_view = gtk_widget_get_parent (web_view); MidoriNewView where = MIDORI_NEW_VIEW_TAB; + + /* FIXME: Open windows opened by scripts in tabs if they otherwise + would be replacing the page the user opened. */ + if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT) + return TRUE; + if (view->open_new_pages_in == MIDORI_NEW_PAGE_TAB) { if (view->open_tabs_in_the_background) @@ -2003,13 +2122,7 @@ webkit_web_view_web_view_ready_cb (GtkWidget* web_view, where = MIDORI_NEW_VIEW_WINDOW; gtk_widget_show (new_view); - if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT) - { - g_debug ("Opening all pages in current tab not implemented"); - g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); - } - else - g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); return TRUE; } @@ -2019,14 +2132,21 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, MidoriView* view) { - GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, - "net", view->net, - "settings", view->settings, - NULL); - midori_view_construct_web_view (MIDORI_VIEW (new_view)); - g_signal_connect (MIDORI_VIEW (new_view)->web_view, "web-view-ready", - G_CALLBACK (webkit_web_view_web_view_ready_cb), view); - return MIDORI_VIEW (new_view)->web_view; + MidoriView* new_view; + + if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT) + new_view = view; + else + { + new_view = g_object_new (MIDORI_TYPE_VIEW, + "net", view->net, + "settings", view->settings, + NULL); + midori_view_construct_web_view (new_view); + g_signal_connect (new_view->web_view, "web-view-ready", + G_CALLBACK (webkit_web_view_web_view_ready_cb), view); + } + return new_view->web_view; } static gboolean @@ -2073,6 +2193,12 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, #else content_type = g_strdup (mime_type); #endif + if (!content_type) + #ifdef G_OS_WIN32 + content_type = g_content_type_get_mime_type ("*"); + #else + content_type = g_strdup ("application/octet-stream"); + #endif description = g_content_type_get_description (content_type); #if GTK_CHECK_VERSION (2, 14, 0) icon = g_content_type_get_icon (content_type); @@ -2673,6 +2799,10 @@ midori_view_construct_web_view (MidoriView* view) g_object_connect (view->web_view, "signal::navigation-policy-decision-requested", midori_view_web_view_navigation_decision_cb, view, + #if WEBKIT_CHECK_VERSION (1, 1, 14) + "signal::resource-request-starting", + midori_view_web_view_resource_request_cb, view, + #endif "signal::load-started", webkit_web_view_load_started_cb, view, "signal::load-committed", @@ -2725,7 +2855,7 @@ midori_view_construct_web_view (MidoriView* view) midori_view_web_view_print_requested_cb, view, #endif #if WEBKIT_CHECK_VERSION (1, 1, 6) - "signal::load-error", + "signal-after::load-error", webkit_web_view_load_error_cb, view, #endif NULL); @@ -2777,8 +2907,10 @@ midori_view_set_uri (MidoriView* view, if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, "")) { + #if !WEBKIT_CHECK_VERSION (1, 1, 14) SoupServer* res_server; guint port; + #endif gchar* res_root; gchar* speed_dial_head; gchar* speed_dial_body; @@ -2792,10 +2924,15 @@ midori_view_set_uri (MidoriView* view, if (G_UNLIKELY (!speed_dial_head)) speed_dial_head = g_strdup (""); + #if WEBKIT_CHECK_VERSION (1, 1, 14) + res_root = g_strdup ("res:/"); + stock_root = g_strdup ("stock:/"); + #else res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); stock_root = g_strdup_printf ("http://localhost:%d/stock", port); + #endif body_fname = g_build_filename (sokoke_set_config_dir (NULL), "speeddial.json", NULL); @@ -2894,7 +3031,9 @@ midori_view_set_uri (MidoriView* view, { midori_view_execute_script (view, &uri[11], NULL); } - else if (g_str_has_prefix (uri, "mailto:")) + else if (g_str_has_prefix (uri, "mailto:") + || g_str_has_prefix (uri, "tel:") + || g_str_has_prefix (uri, "callto:")) { sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); } @@ -3138,7 +3277,7 @@ midori_view_get_proxy_menu_item (MidoriView* view) if (!view->menu_item) { title = midori_view_get_display_title (view); - view->menu_item = sokoke_image_menu_item_new_ellipsized (title); + view->menu_item = katze_image_menu_item_new_ellipsized (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view->menu_item), gtk_image_new_from_pixbuf (view->icon)); @@ -3149,13 +3288,6 @@ midori_view_get_proxy_menu_item (MidoriView* view) return view->menu_item; } -static void -midori_view_tab_label_menu_new_tab_cb (GtkWidget* menuitem, - MidoriView* view) -{ - g_signal_emit (view, signals[NEW_TAB], 0, "", FALSE); -} - static void midori_view_tab_label_menu_open_cb (GtkWidget* menuitem, GtkWidget* view) @@ -3213,16 +3345,23 @@ midori_view_tab_label_menu_close_cb (GtkWidget* menuitem, GtkWidget* midori_view_get_tab_menu (MidoriView* view) { + MidoriBrowser* browser; + GtkActionGroup* actions; GtkWidget* menu; GtkWidget* menuitem; g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + actions = midori_browser_get_action_group (browser); + menu = gtk_menu_new (); - menuitem = gtk_menu_item_new_with_mnemonic (_("New _Tab")); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "TabNew")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "UndoTabClose")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_view_tab_label_menu_new_tab_cb), view); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_OPEN, NULL); @@ -3270,7 +3409,7 @@ midori_view_tab_label_button_release_event (GtkWidget* tab_label, GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget)); katze_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + event, KATZE_MENU_POSITION_CURSOR); return TRUE; } @@ -3677,8 +3816,6 @@ can_do (find) * @from_cache: whether to allow caching * * Reloads the view. - * - * Note: The @from_cache value is currently ignored. **/ void midori_view_reload (MidoriView* view, @@ -3981,7 +4118,22 @@ midori_view_execute_script (MidoriView* view, return TRUE; } -/* For now this is private API */ +/** + * midori_view_get_snapshot + * @view: a #MidoriView + * @width: the desired width + * @height: the desired height + * + * Take a snapshot of the view at the given dimensions. The + * view has to be mapped on the screen. + * + * If width and height are negative, the resulting + * image is going to be optimized for speed. + * + * Returns: a newly allocated #GdkPixbuf + * + * Since: 0.2.1 + **/ GdkPixbuf* midori_view_get_snapshot (MidoriView* view, gint width, diff --git a/midori/midori-view.h b/midori/midori-view.h index 0dbfc52b..fc798fbd 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -195,6 +195,11 @@ midori_view_execute_script (MidoriView* view, const gchar* script, gchar** exception); +GdkPixbuf* +midori_view_get_snapshot (MidoriView* view, + gint width, + gint height); + G_END_DECLS #endif /* __MIDORI_VIEW_H__ */ diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 336a14fb..e8ce8b9c 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -50,6 +50,7 @@ struct _MidoriWebSettings gboolean compact_sidepanel; gboolean show_panel_controls; gboolean right_align_sidepanel; + gboolean open_panels_in_windows; MidoriStartup load_on_startup; gchar* homepage; @@ -82,14 +83,12 @@ struct _MidoriWebSettings gboolean remember_last_visited_pages; gint maximum_history_age; - gboolean remember_last_form_inputs; gboolean remember_last_downloaded_files; gchar* http_proxy; gboolean auto_detect_proxy; MidoriIdentity identify_as; gchar* ident_string; - gint cache_size; gint clear_private_data; }; @@ -127,6 +126,7 @@ enum PROP_COMPACT_SIDEPANEL, PROP_SHOW_PANEL_CONTROLS, PROP_RIGHT_ALIGN_SIDEPANEL, + PROP_OPEN_PANELS_IN_WINDOWS, PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, @@ -150,6 +150,9 @@ enum PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, + PROP_AUTO_LOAD_IMAGES, + PROP_ENABLE_SCRIPTS, + PROP_ENABLE_PLUGINS, PROP_ZOOM_TEXT_AND_IMAGES, PROP_FIND_WHILE_TYPING, PROP_KINETIC_SCROLLING, @@ -159,14 +162,12 @@ enum PROP_REMEMBER_LAST_VISITED_PAGES, PROP_MAXIMUM_HISTORY_AGE, - PROP_REMEMBER_LAST_FORM_INPUTS, PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_HTTP_PROXY, PROP_AUTO_DETECT_PROXY, PROP_IDENTIFY_AS, PROP_IDENT_STRING, - PROP_CACHE_SIZE, PROP_CLEAR_PRIVATE_DATA }; @@ -215,6 +216,7 @@ midori_preferred_encoding_get_type (void) static const GEnumValue values[] = { { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") }, + { MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", N_("Korean (EUC-KR)") }, { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, @@ -252,6 +254,7 @@ midori_toolbar_style_get_type (void) static const GEnumValue values[] = { { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", N_("Default") }, { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", N_("Icons") }, + { MIDORI_TOOLBAR_SMALL_ICONS, "MIDORI_TOOLBAR_SMALL_ICONS", N_("Small icons") }, { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", N_("Text") }, { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Icons and text") }, { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Text beside icons") }, @@ -320,7 +323,7 @@ midori_get_download_dir (void) const gchar* dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD); if (dir) { - g_mkdir_with_parents (dir, 0700); + katze_mkdir_with_parents (dir, 0700); return dir; } return g_get_home_dir (); @@ -566,6 +569,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, flags)); + /** + * MidoriWebSettings:open-panels-in-window: + * + * Whether to open panels in separate windows. + * + * Since: 0.2.2 + */ + g_object_class_install_property (gobject_class, + PROP_OPEN_PANELS_IN_WINDOWS, + g_param_spec_boolean ( + "open-panels-in-windows", + _("Open panels in separate windows"), + _("Whether to always open panels in separate windows"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, PROP_LOAD_ON_STARTUP, @@ -803,6 +822,32 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /* Override properties to localize them for preference proxies */ + g_object_class_install_property (gobject_class, + PROP_AUTO_LOAD_IMAGES, + g_param_spec_boolean ( + "auto-load-images", + _("Load images automatically"), + _("Load and display images automatically"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, + PROP_ENABLE_SCRIPTS, + g_param_spec_boolean ( + "enable-scripts", + _("Enable scripts"), + _("Enable embedded scripting languages"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, + PROP_ENABLE_PLUGINS, + g_param_spec_boolean ( + "enable-plugins", + _("Enable Netscape plugins"), + _("Enable embedded Netscape plugin objects"), + TRUE, + flags)); + /** * MidoriWebSettings:zoom-text-and-images: * @@ -881,6 +926,13 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) + /** + * MidoriWebSettings:remember-last-visited-pages: + * + * Whether the last visited pages are saved. + * + * Deprecated: 0.2.2 + */ g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_VISITED_PAGES, g_param_spec_boolean ( @@ -899,15 +951,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) 0, G_MAXINT, 30, flags)); - g_object_class_install_property (gobject_class, - PROP_REMEMBER_LAST_FORM_INPUTS, - g_param_spec_boolean ( - "remember-last-form-inputs", - _("Remember last form inputs"), - _("Whether the last form inputs are saved"), - TRUE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_DOWNLOADED_FILES, g_param_spec_boolean ( @@ -978,15 +1021,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, - PROP_CACHE_SIZE, - g_param_spec_int ( - "cache-size", - _("Cache size"), - _("The allowed size of the cache"), - 0, G_MAXINT, 100, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** * MidoriWebSettings:clear-private-data: * @@ -1021,6 +1055,8 @@ notify_default_encoding_cb (GObject* object, web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; else if (!strcmp (encoding, "SHIFT_JIS")) web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE; + else if (!strcmp (encoding, "EUC-KR")) + web_settings->preferred_encoding = MIDORI_ENCODING_KOREAN; else if (!strcmp (encoding, "KOI8-R")) web_settings->preferred_encoding = MIDORI_ENCODING_RUSSIAN; else if (!strcmp (encoding, "UTF-8")) @@ -1041,7 +1077,6 @@ midori_web_settings_init (MidoriWebSettings* web_settings) web_settings->http_proxy = NULL; web_settings->show_panel_controls = TRUE; web_settings->open_popups_in_tabs = TRUE; - web_settings->remember_last_form_inputs = TRUE; web_settings->remember_last_downloaded_files = TRUE; web_settings->kinetic_scrolling = TRUE; web_settings->auto_detect_proxy = TRUE; @@ -1070,7 +1105,7 @@ midori_web_settings_finalize (GObject* object) G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } -#if defined (G_OS_UNIX) +#if defined (G_OS_UNIX) && !HAVE_OSX static gchar* get_sys_name (void) { @@ -1233,6 +1268,9 @@ midori_web_settings_set_property (GObject* object, case PROP_RIGHT_ALIGN_SIDEPANEL: web_settings->right_align_sidepanel = g_value_get_boolean (value); break; + case PROP_OPEN_PANELS_IN_WINDOWS: + web_settings->open_panels_in_windows = g_value_get_boolean (value); + break; case PROP_LOAD_ON_STARTUP: web_settings->load_on_startup = g_value_get_enum (value); @@ -1277,6 +1315,9 @@ midori_web_settings_set_property (GObject* object, case MIDORI_ENCODING_JAPANESE: g_object_set (object, "default-encoding", "SHIFT_JIS", NULL); break; + case MIDORI_ENCODING_KOREAN: + g_object_set (object, "default-encoding", "EUC-KR", NULL); + break; case MIDORI_ENCODING_RUSSIAN: g_object_set (object, "default-encoding", "KOI8-R", NULL); break; @@ -1316,6 +1357,18 @@ midori_web_settings_set_property (GObject* object, web_settings->open_popups_in_tabs = g_value_get_boolean (value); break; + case PROP_AUTO_LOAD_IMAGES: + g_object_set (web_settings, "WebKitWebSettings::auto-load-images", + g_value_get_boolean (value), NULL); + break; + case PROP_ENABLE_SCRIPTS: + g_object_set (web_settings, "WebKitWebSettings::enable-scripts", + g_value_get_boolean (value), NULL); + break; + case PROP_ENABLE_PLUGINS: + g_object_set (web_settings, "WebKitWebSettings::enable-plugins", + g_value_get_boolean (value), NULL); + break; case PROP_ZOOM_TEXT_AND_IMAGES: web_settings->zoom_text_and_images = g_value_get_boolean (value); break; @@ -1341,9 +1394,6 @@ midori_web_settings_set_property (GObject* object, case PROP_MAXIMUM_HISTORY_AGE: web_settings->maximum_history_age = g_value_get_int (value); break; - case PROP_REMEMBER_LAST_FORM_INPUTS: - web_settings->remember_last_form_inputs = g_value_get_boolean (value); - break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: web_settings->remember_last_downloaded_files = g_value_get_boolean (value); break; @@ -1375,9 +1425,6 @@ midori_web_settings_set_property (GObject* object, #endif } break; - case PROP_CACHE_SIZE: - web_settings->cache_size = g_value_get_int (value); - break; case PROP_CLEAR_PRIVATE_DATA: web_settings->clear_private_data = g_value_get_int (value); break; @@ -1459,6 +1506,9 @@ midori_web_settings_get_property (GObject* object, case PROP_RIGHT_ALIGN_SIDEPANEL: g_value_set_boolean (value, web_settings->right_align_sidepanel); break; + case PROP_OPEN_PANELS_IN_WINDOWS: + g_value_set_boolean (value, web_settings->open_panels_in_windows); + break; case PROP_LOAD_ON_STARTUP: g_value_set_enum (value, web_settings->load_on_startup); @@ -1522,6 +1572,18 @@ midori_web_settings_get_property (GObject* object, g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; + case PROP_AUTO_LOAD_IMAGES: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::auto-load-images")); + break; + case PROP_ENABLE_SCRIPTS: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-scripts")); + break; + case PROP_ENABLE_PLUGINS: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-plugins")); + break; case PROP_ZOOM_TEXT_AND_IMAGES: g_value_set_boolean (value, web_settings->zoom_text_and_images); break; @@ -1547,9 +1609,6 @@ midori_web_settings_get_property (GObject* object, case PROP_MAXIMUM_HISTORY_AGE: g_value_set_int (value, web_settings->maximum_history_age); break; - case PROP_REMEMBER_LAST_FORM_INPUTS: - g_value_set_boolean (value, web_settings->remember_last_form_inputs); - break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: g_value_set_boolean (value, web_settings->remember_last_downloaded_files); break; @@ -1571,9 +1630,6 @@ midori_web_settings_get_property (GObject* object, } g_value_set_string (value, web_settings->ident_string); break; - case PROP_CACHE_SIZE: - g_value_set_int (value, web_settings->cache_size); - break; case PROP_CLEAR_PRIVATE_DATA: g_value_set_int (value, web_settings->clear_private_data); break; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 82c79390..0826ad54 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -43,6 +43,7 @@ enum MIDORI_CLEAR_WEBSITE_ICONS = 8, MIDORI_CLEAR_TRASH = 16, MIDORI_CLEAR_ON_QUIT = 32, + MIDORI_CLEAR_WEB_CACHE = 64, }; typedef enum @@ -76,6 +77,7 @@ typedef enum { MIDORI_ENCODING_CHINESE, MIDORI_ENCODING_JAPANESE, + MIDORI_ENCODING_KOREAN, MIDORI_ENCODING_RUSSIAN, MIDORI_ENCODING_UNICODE, MIDORI_ENCODING_WESTERN, @@ -105,6 +107,7 @@ typedef enum { MIDORI_TOOLBAR_DEFAULT, MIDORI_TOOLBAR_ICONS, + MIDORI_TOOLBAR_SMALL_ICONS, MIDORI_TOOLBAR_TEXT, MIDORI_TOOLBAR_BOTH, MIDORI_TOOLBAR_BOTH_HORIZ diff --git a/midori/sokoke.c b/midori/sokoke.c index b2f4b59a..932d8e6b 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -11,14 +11,14 @@ */ #include "sokoke.h" -#include "midori-stock.h" - -#include "compat.h" #if HAVE_CONFIG_H #include #endif +#include "compat.h" +#include "midori-stock.h" + #if HAVE_UNISTD_H #include #endif @@ -40,6 +40,17 @@ #include #endif +#ifdef HAVE_HILDON_FM + #include +#endif + +#if HAVE_HILDON + #include + #include + #include + #include +#endif + static gchar* sokoke_js_string_utf8 (JSStringRef js_string) { @@ -73,7 +84,8 @@ sokoke_js_script_eval (JSContextRef js_context, { JSStringRef js_message = JSValueToStringCopy (js_context, js_exception, NULL); - *exception = sokoke_js_string_utf8 (js_message); + if (exception) + *exception = sokoke_js_string_utf8 (js_message); JSStringRelease (js_message); js_value = JSValueMakeNull (js_context); } @@ -85,17 +97,106 @@ sokoke_js_script_eval (JSContextRef js_context, return value; } -static void -error_dialog (const gchar* short_message, - const gchar* detailed_message) +void +sokoke_message_dialog (GtkMessageType message_type, + const gchar* short_message, + const gchar* detailed_message) { GtkWidget* dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", short_message); + NULL, 0, message_type, + #if HAVE_HILDON + GTK_BUTTONS_NONE, + #else + GTK_BUTTONS_OK, + #endif + "%s", short_message); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", detailed_message); - gtk_widget_show (dialog); g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); + gtk_widget_show (dialog); +} + +/** + * sokoke_show_uri_with_mime_type: + * @screen: a #GdkScreen, or %NULL + * @uri: the URI to show + * @mime_type: a MIME type + * @timestamp: the timestamp of the event + * @error: the location of a #GError, or %NULL + * + * Shows the specified URI with an appropriate application, + * as though it had the specified MIME type. + * + * On Maemo, hildon_mime_open_file_with_mime_type() is used. + * + * See also: sokoke_show_uri(). + * + * Return value: %TRUE on success, %FALSE if an error occurred + **/ +gboolean +sokoke_show_uri_with_mime_type (GdkScreen* screen, + const gchar* uri, + const gchar* mime_type, + guint32 timestamp, + GError** error) +{ + gboolean success; + #if HAVE_HILDON + osso_context_t* osso; + DBusConnection* dbus; + + osso = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); + if (!osso) + { + g_print ("Failed to initialize libosso\n"); + return FALSE; + } + + dbus = (DBusConnection *) osso_get_dbus_connection (osso); + if (!dbus) + { + osso_deinitialize (osso); + g_print ("Failed to get dbus connection from osso context\n"); + return FALSE; + } + + success = (hildon_mime_open_file_with_mime_type (dbus, + uri, mime_type) == 1); + osso_deinitialize (osso); + #else + GFile* file = g_file_new_for_uri (uri); + gchar* content_type; + GAppInfo* app_info; + GList* files; + gpointer context; + + #if GLIB_CHECK_VERSION (2, 18, 0) + content_type = g_content_type_from_mime_type (mime_type); + #else + content_type = g_strdup (mime_type); + #endif + + app_info = g_app_info_get_default_for_type (content_type, + !g_str_has_prefix (uri, "file://")); + g_free (content_type); + files = g_list_prepend (NULL, file); + #if GTK_CHECK_VERSION (2, 14, 0) + context = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (context, screen); + gdk_app_launch_context_set_timestamp (context, timestamp); + #else + context = g_app_launch_context_new (); + #endif + + success = g_app_info_launch (app_info, files, context, error); + + g_object_unref (app_info); + g_list_free (files); + g_object_unref (file); + #endif + + return success; } /** @@ -109,6 +210,8 @@ error_dialog (const gchar* short_message, * supports xdg-open, exo-open and gnome-open as fallbacks if * GIO doesn't do the trick. * + * On Maemo, hildon_uri_open() is used. + * * Return value: %TRUE on success, %FALSE if an error occurred **/ gboolean @@ -117,6 +220,11 @@ sokoke_show_uri (GdkScreen* screen, guint32 timestamp, GError** error) { + #if HAVE_HILDON + HildonURIAction* action = hildon_uri_get_default_action_by_uri (uri, NULL); + return hildon_uri_open (uri, action, error); + #else + const gchar* fallbacks [] = { "xdg-open", "exo-open", "gnome-open" }; gsize i; @@ -139,49 +247,113 @@ sokoke_show_uri (GdkScreen* screen, } return FALSE; + #endif } gboolean sokoke_spawn_program (const gchar* command, const gchar* argument, - gboolean quote) + gboolean filename) { - gchar* argument_escaped; - gchar* command_ready; - gchar** argv; GError* error; g_return_val_if_fail (command != NULL, FALSE); g_return_val_if_fail (argument != NULL, FALSE); - argument_escaped = quote ? g_shell_quote (argument) : g_strdup (argument); - if (strstr (command, "%s")) - command_ready = g_strdup_printf (command, argument_escaped); - else - command_ready = g_strconcat (command, " ", argument_escaped, NULL); + if (filename) + { + gboolean success; + + #if HAVE_HILDON + osso_context_t* osso; + DBusConnection* dbus; + + osso = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); + if (!osso) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + "Failed to initialize libosso"); + return FALSE; + } + + dbus = (DBusConnection *) osso_get_dbus_connection (osso); + if (!dbus) + { + osso_deinitialize (osso); + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + "Failed to get dbus connection from osso context"); + return FALSE; + } + + error = NULL; + /* FIXME: This is not correct, find a proper way to do this */ + success = (osso_application_top (osso, command, argument) == OSSO_OK); + osso_deinitialize (osso); + #else + GAppInfo* info; + GFile* file; + GList* files; + + info = g_app_info_create_from_commandline (command, + NULL, G_APP_INFO_CREATE_NONE, NULL); + file = g_file_new_for_commandline_arg (argument); + files = g_list_append (NULL, file); + + error = NULL; + success = g_app_info_launch (info, files, NULL, &error); + g_object_unref (file); + g_list_free (files); + #endif - error = NULL; - if (!g_shell_parse_argv (command_ready, NULL, &argv, &error)) + if (!success) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error ? error->message : ""); + if (error) + g_error_free (error); + return FALSE; + } + } + else { - error_dialog (_("Could not run external program."), error->message); - g_error_free (error); + /* FIXME: Implement Hildon specific version */ + gchar* command_ready; + gchar** argv; + + if (strstr (command, "%s")) + command_ready = g_strdup_printf (command, argument); + else + command_ready = g_strconcat (command, " ", argument, NULL); + + error = NULL; + if (!g_shell_parse_argv (command_ready, NULL, &argv, &error)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error->message); + g_error_free (error); + g_free (command_ready); + return FALSE; + } g_free (command_ready); - g_free (argument_escaped); - return FALSE; - } - error = NULL; - if (!g_spawn_async (NULL, argv, NULL, - (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, NULL, &error)) - { - error_dialog (_("Could not run external program."), error->message); - g_error_free (error); + error = NULL; + if (!g_spawn_async (NULL, argv, NULL, + (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &error)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error->message); + g_error_free (error); + } + + g_strfreev (argv); } - g_strfreev (argv); - g_free (command_ready); - g_free (argument_escaped); return TRUE; } @@ -365,6 +537,8 @@ sokoke_magic_uri (const gchar* uri, /* Just return if it's a javascript: or mailto: uri */ if (g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:") + || g_str_has_prefix (uri, "tel:") + || g_str_has_prefix (uri, "callto:") || g_str_has_prefix (uri, "data:")) return g_strdup (uri); /* Add file:// if we have a local path */ @@ -428,11 +602,22 @@ sokoke_format_uri_for_display (const gchar* uri) { if (uri && g_str_has_prefix (uri, "http://")) { - gchar* unescaped = g_uri_unescape_string (uri, NULL); + gchar* unescaped = g_uri_unescape_string (uri, " +"); #ifdef HAVE_LIBSOUP_2_27_90 gchar* path; - gchar* hostname = sokoke_hostname_from_uri (unescaped, &path); - gchar* decoded = g_hostname_to_unicode (hostname); + gchar* hostname; + gchar* decoded; + + if (!unescaped) + return g_strdup (uri); + else if (!g_utf8_validate (unescaped, -1, NULL)) + { + g_free (unescaped); + return g_strdup (uri); + } + + hostname = sokoke_hostname_from_uri (unescaped, &path); + decoded = g_hostname_to_unicode (hostname); if (decoded) { @@ -446,6 +631,15 @@ sokoke_format_uri_for_display (const gchar* uri) return unescaped; #elif HAVE_LIBIDN gchar* decoded; + + if (!unescaped) + return g_strdup (uri); + else if (!g_utf8_validate (unescaped, -1, NULL)) + { + g_free (unescaped); + return g_strdup (uri); + } + if (!idna_to_unicode_8z8z (unescaped, &decoded, 0) == IDNA_SUCCESS) return unescaped; g_free (unescaped); @@ -490,15 +684,6 @@ sokoke_container_show_children (GtkContainer* container) gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); } -void -sokoke_widget_popup (GtkWidget* widget, - GtkMenu* menu, - GdkEventButton* event, - SokokeMenuPos pos) -{ - katze_widget_popup (widget, menu, event, (KatzeMenuPos)pos); -} - typedef enum { SOKOKE_DESKTOP_UNTESTED, @@ -608,24 +793,6 @@ sokoke_xfce_header_new (const gchar* icon, return NULL; } -GtkWidget* -sokoke_hig_frame_new (const gchar* title) -{ - /* Create a frame with no actual frame but a bold label and indentation */ - GtkWidget* frame = gtk_frame_new (NULL); - #ifdef G_OS_WIN32 - gtk_frame_set_label (GTK_FRAME (frame), title); - #else - gchar* title_bold = g_strdup_printf ("%s", title); - GtkWidget* label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), title_bold); - g_free (title_bold); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - #endif - return frame; -} - void sokoke_widget_set_pango_font_style (GtkWidget* widget, PangoStyle style) @@ -888,20 +1055,6 @@ sokoke_action_create_popup_menu_item (GtkAction* action) return menuitem; } -/** - * sokoke_image_menu_item_new_ellipsized: - * @label: the text of the menu item - * - * Creates a new #GtkImageMenuItem containing an ellipsized label. - * - * Return value: a new #GtkImageMenuItem - **/ -GtkWidget* -sokoke_image_menu_item_new_ellipsized (const gchar* label) -{ - return katze_image_menu_item_new_ellipsized (label); -} - /** * sokoke_time_t_to_julian: * @timestamp: a time_t timestamp value @@ -934,6 +1087,11 @@ sokoke_time_t_to_julian (const time_t* timestamp) void sokoke_register_stock_items (void) { + GtkIconSource* icon_source; + GtkIconSet* icon_set; + GtkIconFactory* factory; + gsize i; + typedef struct { const gchar* stock_id; @@ -942,11 +1100,6 @@ sokoke_register_stock_items (void) guint keyval; const gchar* fallback; } FatStockItem; - GtkIconSource* icon_source; - GtkIconSet* icon_set; - GtkIconFactory* factory = gtk_icon_factory_new (); - gsize i; - static FatStockItem items[] = { { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, @@ -958,7 +1111,7 @@ sokoke_register_stock_items (void) { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, - { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, + { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK, GDK_B, GTK_STOCK_DIRECTORY }, { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, @@ -972,6 +1125,7 @@ sokoke_register_stock_items (void) { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, }; + factory = gtk_icon_factory_new (); for (i = 0; i < G_N_ELEMENTS (items); i++) { icon_set = gtk_icon_set_new (); @@ -991,6 +1145,55 @@ sokoke_register_stock_items (void) gtk_stock_add ((GtkStockItem*)items, G_N_ELEMENTS (items)); gtk_icon_factory_add_default (factory); g_object_unref (factory); + + #if HAVE_HILDON + /* Maemo doesn't theme stock icons. So we map platform icons + to stock icons. These are all monochrome toolbar icons. */ + typedef struct + { + const gchar* stock_id; + const gchar* icon_name; + } CompatItem; + static CompatItem compat_items[] = + { + { GTK_STOCK_ADD, "general_add" }, + { GTK_STOCK_BOLD, "general_bold" }, + { GTK_STOCK_CLOSE, "general_close_b" }, + { GTK_STOCK_DELETE, "general_delete" }, + { GTK_STOCK_DIRECTORY, "general_toolbar_folder" }, + { GTK_STOCK_FIND, "general_search" }, + { GTK_STOCK_FULLSCREEN, "general_fullsize_b" }, + { GTK_STOCK_GO_BACK, "general_back" }, + { GTK_STOCK_GO_FORWARD, "general_forward" }, + { GTK_STOCK_GO_UP, "filemanager_folder_up" }, + { GTK_STOCK_GOTO_FIRST, "pdf_viewer_first_page" }, + { GTK_STOCK_GOTO_LAST, "pdf_viewer_last_page" }, + { GTK_STOCK_INFO, "general_information" }, + { GTK_STOCK_ITALIC, "general_italic" }, + { GTK_STOCK_JUMP_TO, "general_move_to_folder" }, + { GTK_STOCK_PREFERENCES,"general_settings" }, + { GTK_STOCK_REFRESH, "general_refresh" }, + { GTK_STOCK_SAVE, "notes_save" }, + { GTK_STOCK_STOP, "general_stop" }, + { GTK_STOCK_UNDERLINE, "notes_underline" }, + { GTK_STOCK_ZOOM_IN, "pdf_zoomin" }, + { GTK_STOCK_ZOOM_OUT, "pdf_zoomout" }, + }; + + factory = gtk_icon_factory_new (); + for (i = 0; i < G_N_ELEMENTS (compat_items); i++) + { + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, compat_items[i].icon_name); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, compat_items[i].stock_id, icon_set); + gtk_icon_set_unref (icon_set); + } + gtk_icon_factory_add_default (factory); + g_object_unref (factory); + #endif } /** @@ -1117,6 +1320,7 @@ sokoke_find_data_filename (const gchar* filename) return g_build_filename (MDATADIR, filename, NULL); } +#if !WEBKIT_CHECK_VERSION (1, 1, 14) static void res_server_handler_cb (SoupServer* res_server, SoupMessage* msg, @@ -1209,6 +1413,7 @@ sokoke_get_res_server (void) return res_server; } +#endif gchar* sokoke_replace_variables (const gchar* template, @@ -1234,3 +1439,75 @@ sokoke_replace_variables (const gchar* template, return result; } + +/** + * sokoke_window_activate_key: + * @window: a #GtkWindow + * @event: a #GdkEventKey + * + * Attempts to activate they key from the event, much + * like gtk_window_activate_key(), including keys + * that gtk_accelerator_valid() considers invalid. + * + * Return value: %TRUE on success + **/ +gboolean +sokoke_window_activate_key (GtkWindow* window, + GdkEventKey* event) +{ + gchar *accel_name; + GQuark accel_quark; + GObject* object; + GSList *slist; + + if (gtk_window_activate_key (window, event)) + return TRUE; + + /* We don't use gtk_accel_groups_activate because it refuses to + activate anything that gtk_accelerator_valid doesn't like. */ + accel_name = gtk_accelerator_name (event->keyval, (event->state & gtk_accelerator_get_default_mod_mask ())); + accel_quark = g_quark_from_string (accel_name); + g_free (accel_name); + object = G_OBJECT (window); + + for (slist = gtk_accel_groups_from_object (object); slist; slist = slist->next) + if (gtk_accel_group_activate (slist->data, accel_quark, + object, event->keyval, event->state)) + return TRUE; + + return FALSE; +} + +/** + * sokoke_file_chooser_dialog_new: + * @title: a window title, or %NULL + * @window: a parent #GtkWindow, or %NULL + * @action: a #GtkFileChooserAction + * + * Creates a new file chooser dialog, as appropriate for + * the platform, with buttons according to the @action. + * + * The positive response is %GTK_RESPONSE_OK. + * + * Return value: a new #GtkFileChooser + **/ +GtkWidget* +sokoke_file_chooser_dialog_new (const gchar* title, + GtkWindow* window, + GtkFileChooserAction action) +{ + const gchar* stock_id = GTK_STOCK_OPEN; + GtkWidget* dialog; + + if (action == GTK_FILE_CHOOSER_ACTION_SAVE) + stock_id = GTK_STOCK_SAVE; + #ifdef HAVE_HILDON_FM + dialog = hildon_file_chooser_dialog_new (window, action); + #else + dialog = gtk_file_chooser_dialog_new (title, window, action, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + stock_id, GTK_RESPONSE_OK, NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), stock_id); + #endif + return dialog; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index f01de6cc..5f805a33 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -15,8 +15,7 @@ #include -#include -#include +#include #include gchar* @@ -27,6 +26,18 @@ sokoke_js_script_eval (JSContextRef js_context, /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +void +sokoke_message_dialog (GtkMessageType message_type, + const gchar* short_message, + const gchar* detailed_message); + +gboolean +sokoke_show_uri_with_mime_type (GdkScreen* screen, + const gchar* uri, + const gchar* mime_type, + guint32 timestamp, + GError** error); + gboolean sokoke_show_uri (GdkScreen* screen, const gchar* uri, @@ -55,12 +66,6 @@ sokoke_magic_uri (const gchar* uri, gchar* sokoke_format_uri_for_display (const gchar* uri); -typedef enum { - SOKOKE_MENU_POSITION_CURSOR = 0, - SOKOKE_MENU_POSITION_LEFT, - SOKOKE_MENU_POSITION_RIGHT -} SokokeMenuPos; - void sokoke_combo_box_add_strings (GtkComboBox* combobox, const gchar* label_first, @@ -73,19 +78,10 @@ sokoke_widget_set_visible (GtkWidget* widget, void sokoke_container_show_children (GtkContainer* container); -void -sokoke_widget_popup (GtkWidget* widget, - GtkMenu* menu, - GdkEventButton* event, - SokokeMenuPos pos); - GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title); -GtkWidget* -sokoke_hig_frame_new (const gchar* title); - void sokoke_widget_set_pango_font_style (GtkWidget* widget, PangoStyle style); @@ -145,9 +141,6 @@ sokoke_widget_get_text_size (GtkWidget* widget, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); -GtkWidget* -sokoke_image_menu_item_new_ellipsized (const gchar* label); - gint64 sokoke_time_t_to_julian (const time_t* timestamp); @@ -168,11 +161,22 @@ sokoke_find_config_filename (const gchar* folder, gchar* sokoke_find_data_filename (const gchar* filename); +#if !WEBKIT_CHECK_VERSION (1, 1, 14) SoupServer* sokoke_get_res_server (void); +#endif gchar* sokoke_replace_variables (const gchar* template, const gchar* variable_first, ...); +gboolean +sokoke_window_activate_key (GtkWindow* window, + GdkEventKey* event); + +GtkWidget* +sokoke_file_chooser_dialog_new (const gchar* title, + GtkWindow* window, + GtkFileChooserAction action); + #endif /* !__SOKOKE_H__ */ diff --git a/midori/wscript_build b/midori/wscript_build index 2d1ae2c9..8948599c 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -10,7 +10,9 @@ obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.', excludes=['main.c']) obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') -obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML WS2_32 OPENSSL HILDON' +obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE LIBNOTIFY WEBKIT LIBXML ' \ + 'WS2_32 OPENSSL ' \ + 'HILDON HILDON_FM' obj.uselib_local = 'katze' obj.install_path = None @@ -19,7 +21,7 @@ obj.name = 'panels' obj.target = 'panels' obj.includes = '. ..' obj.find_sources_in_dirs ('../panels') -obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML X11' obj.uselib_local = 'midori-core' obj.install_path = None diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 0d1c092e..efeec635 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -280,14 +280,21 @@ static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) { - GtkWidget* dialog = gtk_message_dialog_new ( + gchar* path_scripts, *path_styles; + GtkWidget* dialog; + + path_scripts = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, "scripts", NULL); + path_styles = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, "styles", NULL); + dialog = gtk_message_dialog_new ( GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Copy userscripts to the folder %s and " - "copy userstyles to the folder %s."), - "~/.local/share/midori/scripts", - "~/.local/share/midori/styles"); + "copy userstyles to the folder %s."), path_scripts, path_styles); + g_free (path_scripts); + g_free (path_styles); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 0196eda2..01e91123 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -32,6 +32,10 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gboolean new_bookmark, gboolean is_folder); +void +midori_browser_open_bookmark (MidoriBrowser* browser, + KatzeItem* item); + struct _MidoriBookmarks { GtkVBox parent_instance; @@ -182,6 +186,14 @@ midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem) NULL, TRUE, TRUE); } +static void +midori_bookmarks_import_clicked_cb (GtkWidget* toolitem) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem)); + /* FIXME: Take selected folder into account */ + midori_browser_activate_action (browser, "BookmarksImport"); +} + static void midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, MidoriBookmarks* bookmarks) @@ -255,6 +267,13 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_tool_item_set_expand (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CONVERT); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Import bookmarks...")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_bookmarks_import_clicked_cb), bookmarks); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add a new folder")); @@ -563,9 +582,7 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else if (katze_item_get_uri (item)) - pixbuf = katze_net_load_icon ( - MIDORI_BOOKMARKS (gtk_widget_get_parent (treeview))->net, - katze_item_get_uri (item), NULL, treeview, NULL); + pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); if (pixbuf) @@ -603,19 +620,17 @@ midori_bookmarks_row_activated_cb (GtkTreeView* treeview, GtkTreeModel* model; GtkTreeIter iter; KatzeItem* item; - const gchar* uri; model = gtk_tree_view_get_model (treeview); if (gtk_tree_model_get_iter (model, &iter, path)) { + MidoriBrowser* browser; + gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_set_current_uri (browser, uri); - } + + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_open_bookmark (browser, item); g_object_unref (item); } @@ -797,8 +812,7 @@ midori_bookmarks_popup (GtkWidget* widget, midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL, item, midori_bookmarks_delete_activate_cb, bookmarks); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } static gboolean diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index 5bbaa9ab..329a67e4 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -73,7 +73,7 @@ midori_extensions_class_init (MidoriExtensionsClass* class) gobject_class->get_property = midori_extensions_get_property; gobject_class->finalize = midori_extensions_finalize; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE; g_object_class_install_property (gobject_class, PROP_APP, @@ -183,6 +183,10 @@ midori_extensions_set_property (GObject* object, i = 0; while ((extension = katze_array_get_nth_item (array, i++))) midori_extensions_add_item_cb (array, extension, extensions); + + /* Hide if there are no extensions at all */ + if (!katze_array_get_nth_item (array, 0)) + gtk_widget_hide (GTK_WIDGET (object)); } break; default: @@ -378,8 +382,7 @@ midori_extensions_popup (GtkWidget* widget, midori_extensions_about_activate_cb, FALSE, extensions); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); g_free (website); } diff --git a/panels/midori-history.c b/panels/midori-history.c index 80f5a695..b198e7a6 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -328,7 +328,7 @@ midori_history_add_item_cb (KatzeArray* array, if (array == history->array) { gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - &iter, NULL, G_MAXINT, 0, added_item, -1); + &iter, NULL, 0, 0, added_item, -1); return; } @@ -344,7 +344,7 @@ midori_history_add_item_cb (KatzeArray* array, GtkTreeIter child_iter; gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - &child_iter, &iter, G_MAXINT, 0, added_item, -1); + &child_iter, &iter, 0, 0, added_item, -1); break; } g_object_unref (item); @@ -560,9 +560,7 @@ midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - pixbuf = katze_net_load_icon ( - MIDORI_HISTORY (gtk_widget_get_parent (treeview))->net, - katze_item_get_uri (item), NULL, treeview, NULL); + pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -577,7 +575,7 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, - GtkWidget* treeview) + MidoriHistory* history) { KatzeItem* item; gint64 age; @@ -590,9 +588,21 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, { gchar* sdate; - g_assert (age >= 0); + /* A negative age is a date in the future, the clock is probably off */ + if (age < -1) + { + static gboolean clock_warning = FALSE; + if (!clock_warning) + { + midori_app_send_notification (history->app, + _("Erroneous clock time"), + _("The clock time lies in the past. " + "Please check the current date and time.")); + clock_warning = TRUE; + } + } - if (age > 7) + if (age > 7 || age < 0) { g_object_set (renderer, "text", katze_item_get_name (item), NULL); } @@ -828,8 +838,7 @@ midori_history_popup (GtkWidget* widget, midori_history_popup_item (menu, GTK_STOCK_DELETE, NULL, item, midori_history_delete_activate_cb, history); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } static gboolean @@ -941,7 +950,7 @@ midori_history_init (MidoriHistory* history) gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb, - treeview, NULL); + history, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_object_unref (model); g_object_connect (treeview, diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index 11236762..6d861b45 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -255,8 +255,7 @@ midori_plugins_init (MidoriPlugins* plugins) FIXME: Ensure separators contained in the string can't break it */ gchar* value = sokoke_js_script_eval (js_context, "function plugins (l) { var f = new Array (); for (i in l) " - "{ var t = l[i].name; " - "f.push (l[i].name + '|' + l[i].filename); } return f; }" + "{ f.push (l[i].name + '|' + l[i].filename); } return f; }" "plugins (navigator.plugins)", NULL); gchar** items = g_strsplit (value, ",", 0); guint i = 0; diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index cb0e89e5..46783370 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -483,8 +483,7 @@ midori_transfers_popup (GtkWidget* widget, _("Copy Link Loc_ation"), download, midori_transfers_copy_address_activate_cb, FALSE, transfers); - sokoke_widget_popup (widget, GTK_MENU (menu), - event, SOKOKE_MENU_POSITION_CURSOR); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } #endif diff --git a/po/LINGUAS b/po/LINGUAS index eb729205..47ec147d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ast ca cs da de el en_GB es et fi fr gl he hu id it ja ko nl pl pt pt_BR ro ru sk sr sr@latin sv tr uk zh_CN zh_TW +ast ca cs da de el en_GB es et fi fr gl he hu id it ja ko nl no pl pt pt_BR ro ru sk sr sr@latin sv tr uk zh_CN zh_TW diff --git a/po/POTFILES.in b/po/POTFILES.in index 42792b86..a84ccae4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -26,6 +26,7 @@ katze/katze-utils.c katze/katze-item.c katze/katze-array.c katze/katze-arrayaction.c +katze/katze-preferences.c extensions/adblock.c extensions/colorful-tabs.c extensions/cookie-manager/cookie-manager.c @@ -38,9 +39,11 @@ extensions/feed-panel/feed-parse.c extensions/feed-panel/feed-rss.c extensions/feed-panel/main.c extensions/formhistory.c -extensions/mouse-gestures/main.c +extensions/mouse-gestures.c extensions/page-holder.c extensions/shortcuts.c extensions/statusbar-features.c extensions/tab-panel.c +extensions/tab-switcher.c extensions/toolbar-editor.c +extensions/web-cache.c diff --git a/po/ca.po b/po/ca.po index 7b41386a..590fc5b9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,14 +3,15 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Carles Muñoz Gorriz , 2009. +# Harald Servat , 2009. # msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 23:58+0200\n" -"PO-Revision-Date: 2009-09-13 19:12+0100\n" -"Last-Translator: Carles Muñoz Gorriz \n" +"POT-Creation-Date: 2009-11-13 19:23+0100\n" +"PO-Revision-Date: 2009-12-09 17:23+0100\n" +"Last-Translator: Harald Servat \n" "Language-Team: Catalan\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,9 +24,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1517 -#: ../midori/main.c:1525 ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1492 +#: ../midori/main.c:1685 +#: ../midori/main.c:1693 +#: ../midori/main.c:1704 +#: ../midori/midori-websettings.c:289 msgid "Midori" msgstr "Midori" @@ -33,1785 +37,1795 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la configuració: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no és vàlid per %s" -#: ../midori/main.c:158 ../midori/main.c:238 +#: ../midori/main.c:164 +#: ../midori/main.c:245 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:350 +#: ../midori/main.c:369 +#: ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" -#: ../midori/main.c:382 -#, fuzzy, c-format +#: ../midori/main.c:401 +#: ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 +#, c-format msgid "Failed to execute database statement: %s\n" -msgstr "No s'ha pogut fer la còpia de seguretat de la base de dades." +msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../midori/main.c:436 -#, fuzzy, c-format +#: ../midori/main.c:455 +#, c-format msgid "Failed to remove history item: %s\n" -msgstr "s'ha produït un error en pam_set_item()\n" +msgstr "No s'ha pogut eliminar un ítem de l'historial: %s\n" -#: ../midori/main.c:460 -#, fuzzy, c-format +#: ../midori/main.c:479 +#, c-format msgid "Failed to clear history: %s\n" -msgstr "Ha estat impossible eliminar el valor de la variable DISPLAY!" +msgstr "No s'ha pogut netejar l'historial: %s\n" -#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 -#, fuzzy, c-format +#: ../midori/main.c:502 +#: ../midori/main.c:536 +#: ../midori/main.c:552 +#, c-format msgid "Failed to add history item: %s\n" -msgstr "Cerca un _element a afegir al calaix:" +msgstr "No s'ha pogut afegir un ítem a l'historial: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 -#, fuzzy, c-format +#: ../midori/main.c:731 +#, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" -"dpkg: %s: avís - s'ha produït un error en esborrar l'antiga còpia de " -"seguretat «%.250s»: %s\n" +msgstr "No s'han pogut eliminar ítems antics de l'historial: %s\n" -#: ../midori/main.c:741 -#, fuzzy, c-format +#: ../midori/main.c:760 +#, c-format msgid "The configuration couldn't be saved. %s" -msgstr "No s'ha pogut desar el text." +msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:779 +#: ../midori/main.c:798 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No es pot desar les enginys de cerca. %s" -#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 +#: ../midori/main.c:817 +#: ../midori/main.c:845 +#: ../midori/main.c:874 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 ../midori/main.c:901 -#, fuzzy, c-format +#: ../midori/main.c:897 +#: ../midori/main.c:920 +#, c-format msgid "The trash couldn't be saved. %s" -msgstr "No s'ha pogut desar el text." +msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:974 -#, fuzzy, c-format +#: ../midori/main.c:989 +#: ../midori/main.c:1161 +#, c-format msgid "The session couldn't be saved. %s" -msgstr "No s'ha pogut desar el text." +msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:1101 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" +#: ../midori/main.c:1199 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." -#: ../midori/main.c:1116 -#, fuzzy +#: ../midori/main.c:1214 msgid "Modify _preferences" -msgstr "Modificació de les preferències" +msgstr "Modificació de les _preferències" -#: ../midori/main.c:1120 -#, fuzzy +#: ../midori/main.c:1218 msgid "Reset the last _session" -msgstr "Importar la ltima sessi" +msgstr "Reiniciar la darrera _sessió" -#: ../midori/main.c:1125 -#, fuzzy +#: ../midori/main.c:1223 msgid "Disable all _extensions" -msgstr "" -" --posix\n" -" inhabilita totes les extensions GNU.\n" +msgstr "Inhabilita totes les _extensions" + +#: ../midori/main.c:1392 +#: ../midori/main.c:1902 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1343 -#, fuzzy +#: ../midori/main.c:1492 msgid "No filename specified" -msgstr "%s: No s'ha especificat el rebedor." +msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1366 -#, fuzzy +#: ../midori/main.c:1515 msgid "An unknown error occured." -msgstr "%s: S'ha produït un error desconegut" +msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1398 -#, fuzzy, c-format +#: ../midori/main.c:1547 +#, c-format msgid "Snapshot saved to: %s\n" -msgstr " S'ha desat la configuració a ~/" +msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1609 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1447 +#: ../midori/main.c:1609 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1449 +#: ../midori/main.c:1612 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1449 +#: ../midori/main.c:1612 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1451 +#: ../midori/main.c:1615 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1454 -#, fuzzy +#: ../midori/main.c:1618 msgid "Take a snapshot of the specified URI" -msgstr "No s'ha especificat cap URL des d'on reproduir." +msgstr "Fer una captura de la ubicació especificada" -#: ../midori/main.c:1457 -#, fuzzy +#: ../midori/main.c:1621 msgid "Execute the specified command" -msgstr "No heu especificat cap ordre" +msgstr "Executar la comanda especificada" -#: ../midori/main.c:1459 -#, fuzzy +#: ../midori/main.c:1623 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1461 +#: ../midori/main.c:1625 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1514 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1539 -#, fuzzy +#: ../midori/main.c:1707 msgid "Check for new versions at:" -msgstr "Verifica si hi ha noves versions dels paquets" +msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1619 -#, fuzzy +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." -msgstr "La carpeta que heu especificat és un camí invàlid." +msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1655 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1715 -#, fuzzy, c-format +#: ../midori/main.c:1869 +#, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "No s'ha pogut carregar els següents fitxers:" +msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1887 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1742 -#, fuzzy, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "No s'ha pogut carregar el fitxer." - -#: ../midori/main.c:1755 -#, fuzzy, c-format +#: ../midori/main.c:1915 +#, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "No s'ha pogut carregar el fitxer." +msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1768 -#, fuzzy, c-format +#: ../midori/main.c:1928 +#, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "No s'ha pogut carregar el fitxer." +msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1780 -#, fuzzy +#: ../midori/main.c:1940 msgid "The following errors occured:" -msgstr "S'ha produït el següent error:" +msgstr "S'han produït els següents errors:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1956 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:251 msgid "File not found." msgstr "No s'ha trobat el fitxer." -#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 -#, fuzzy +#: ../midori/midori-array.c:260 +#: ../midori/midori-array.c:270 msgid "Malformed document." -msgstr "Valida el document" +msgstr "Document format erròniament." -#: ../midori/midori-array.c:429 ../midori/sokoke.c:694 -#, fuzzy, c-format +#: ../midori/midori-array.c:437 +#: ../midori/sokoke.c:771 +#, c-format msgid "Writing failed." -msgstr "Ha fallat al escriure la petició HTTP: %s.\n" +msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:307 ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 -#, fuzzy +#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4702 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4232 -#, fuzzy +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:4699 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:434 -#, fuzzy, c-format +#: ../midori/midori-browser.c:466 +#, c-format msgid "Unexpected action '%s'." -msgstr "Acció del comandament" +msgstr "Acció inesperada '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:665 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:665 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:667 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:667 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:697 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:661 ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:710 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:680 ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:729 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:752 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:704 ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:757 +#: ../midori/midori-browser.c:798 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:876 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1172 -#, fuzzy, c-format +#: ../midori/midori-browser.c:1248 +#: ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../midori/midori-browser.c:1284 +#, c-format msgid "The file '%s' has been downloaded." -msgstr "S'ha desat el fitxer" +msgstr "S'ha descarregat el fitxer '%s'." -#: ../midori/midori-browser.c:1176 +#: ../midori/midori-browser.c:1288 msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1429 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:2136 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:3430 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 -#, fuzzy +#: ../midori/midori-browser.c:2228 +#: ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nou canal" + +#: ../midori/midori-browser.c:2251 +#: ../midori/midori-browser.c:4743 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Afegeix una adreça d'interès" + +#: ../midori/midori-browser.c:3847 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:824 msgid "Open all in _Tabs" -msgstr "Obre els equips en noves pestanyes" +msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:3437 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 -#, fuzzy +#: ../midori/midori-browser.c:3854 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:830 +#: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:3440 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 -#, fuzzy +#: ../midori/midori-browser.c:3857 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:832 +#: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4164 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:3754 +#: ../midori/midori-browser.c:4168 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4181 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:3777 ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:4191 +#: ../midori/midori-preferences.c:527 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4196 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:3787 +#: ../midori/midori-browser.c:4201 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:3792 +#: ../midori/midori-browser.c:4206 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:3797 ../midori/sokoke.c:868 -#, fuzzy +#: ../midori/midori-browser.c:4211 +#: ../midori/sokoke.c:944 msgid "_Closed Tabs" -msgstr "els separadors no són compatibles" +msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4219 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4315 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4331 msgid "translator-credits" -msgstr "Carles Muñoz Gorriz , 2009." +msgstr "" +"Carles Muñoz Gorriz , 2009.\n" +"Harald Servat , 2009." -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4613 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:4165 ../midori/sokoke.c:869 +#: ../midori/midori-browser.c:4615 +#: ../midori/sokoke.c:945 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4616 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:4169 +#: ../midori/midori-browser.c:4619 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:4622 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4625 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:4177 -#, fuzzy +#: ../midori/midori-browser.c:4627 msgid "Add to Speed _dial" -msgstr "Trieu l'ISP a trucar" +msgstr "Afegir al _marcador ràpid" -#: ../midori/midori-browser.c:4178 -#, fuzzy +#: ../midori/midori-browser.c:4628 msgid "Add shortcut to speed dial" -msgstr "No s'ha pogut afegir una drecera nova" +msgstr "Afegir drecera al marcador ràpid" + +#: ../midori/midori-browser.c:4630 +msgid "Add Shortcut to the _desktop" +msgstr "Adefir drecera a l'_escriptori" + +#: ../midori/midori-browser.c:4631 +msgid "Add shortcut to the desktop" +msgstr "Afegir drecera a l'escriptori" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:4633 +msgid "Subscribe to News _feed" +msgstr "Subscriure's a un _canal de notícies" + +#: ../midori/midori-browser.c:4634 +msgid "Subscribe to this news feed" +msgstr "Subscriure's a aquest canal de notícies" + +#: ../midori/midori-browser.c:4639 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4640 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:4642 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:4184 +#: ../midori/midori-browser.c:4643 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:4187 -#, fuzzy +#: ../midori/midori-browser.c:4646 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:4190 -#, fuzzy +#: ../midori/midori-browser.c:4649 msgid "Quit the application" -msgstr "Surt d'aquesta aplicació" +msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4651 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:4195 -#, fuzzy +#: ../midori/midori-browser.c:4655 +msgid "Undo the last modification" +msgstr "Desfer la darrera modificació" + +#: ../midori/midori-browser.c:4658 +msgid "Redo the last modification" +msgstr "Refer la darrera modifcació" + +#: ../midori/midori-browser.c:4662 msgid "Cut the selected text" -msgstr "Suprimeix el text seleccionat" +msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4201 -#, fuzzy +#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4668 msgid "Copy the selected text" -msgstr "Còpia el text seleccionat al portaretalls" +msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:4204 -#, fuzzy +#: ../midori/midori-browser.c:4671 msgid "Paste text from the clipboard" -msgstr "Enganxa objectes del porta-retalls" +msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:4207 -#, fuzzy +#: ../midori/midori-browser.c:4674 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:4210 -#, fuzzy +#: ../midori/midori-browser.c:4677 msgid "Select all text" -msgstr "Selecciona tot el text." +msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:4680 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4682 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4683 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4685 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4686 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:4223 -#, fuzzy +#: ../midori/midori-browser.c:4690 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4692 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4693 msgid "_Toolbars" msgstr "Barres d'_eines" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4705 msgid "Increase the zoom level" -msgstr "Augmenta el nivell de zoom" +msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:4708 msgid "Decrease the zoom level" -msgstr "Disminueix el nivell de zoom" +msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:4244 -#, fuzzy +#: ../midori/midori-browser.c:4711 msgid "Reset the zoom level" -msgstr "Nivell màxim de zoom" +msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4712 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:4247 -#, fuzzy +#: ../midori/midori-browser.c:4714 msgid "View So_urce" -msgstr "És tan..." +msgstr "Veure codi _font" -#: ../midori/midori-browser.c:4248 -#, fuzzy +#: ../midori/midori-browser.c:4715 msgid "View the source code of the page" -msgstr "Codi font Emacs Lisp" +msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:4250 -#, fuzzy +#: ../midori/midori-browser.c:4717 msgid "View Selection Source" -msgstr "Visualització de codi font - Conglomerate" +msgstr "Veure el codi font de la selecció" -#: ../midori/midori-browser.c:4251 -#, fuzzy +#: ../midori/midori-browser.c:4718 msgid "View the source code of the selection" -msgstr "Codi font Emacs Lisp" +msgstr "Veure el codi font de la selecció" -#: ../midori/midori-browser.c:4255 -#, fuzzy +#: ../midori/midori-browser.c:4722 msgid "Toggle fullscreen view" -msgstr "Commuta la vista en pantalla completa" +msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4724 msgid "_Go" msgstr "_Vés" -#: ../midori/midori-browser.c:4260 +#: ../midori/midori-browser.c:4727 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:4730 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:4733 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4735 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:4269 +#: ../midori/midori-browser.c:4736 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:4738 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4739 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:4276 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Afegeix una adreça d'interès" - -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4745 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4746 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:4281 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4748 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4749 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4752 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4753 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4757 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4758 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4760 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4761 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4763 +msgid "Focus _Current Tab" +msgstr "Enfocar la pestanya _actual" + +#: ../midori/midori-browser.c:4764 +msgid "Focus the current tab" +msgstr "Enfocar la pestanya actual" + +#: ../midori/midori-browser.c:4766 +msgid "Open last _session" +msgstr "Obrir la darrera _sessió" + +#: ../midori/midori-browser.c:4767 +msgid "Open the tabs saved in the last session" +msgstr "Obrir les pestanyes emmagatzemades a la darrera sessió" + +#: ../midori/midori-browser.c:4769 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4771 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4772 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4774 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4775 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:4777 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4778 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:4308 -#, fuzzy +#: ../midori/midori-browser.c:4781 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:4315 -#, fuzzy +#: ../midori/midori-browser.c:4788 msgid "P_rivate Browsing" -msgstr "Navegació web" +msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4789 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4794 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:4795 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:4798 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:4326 -#, fuzzy +#: ../midori/midori-browser.c:4799 msgid "Show navigationbar" -msgstr "Mostra parpellejant" +msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4802 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4803 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4806 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4807 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:4810 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:4338 +#: ../midori/midori-browser.c:4811 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:4814 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4815 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:4822 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:4352 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4825 +#: ../midori/midori-websettings.c:215 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:4829 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:4359 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4832 +#: ../midori/midori-websettings.c:217 +msgid "Korean (EUC-KR)" +msgstr "Koreà (EUC-KR)" + +#: ../midori/midori-browser.c:4835 +#: ../midori/midori-websettings.c:218 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:4362 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:4838 +#: ../midori/midori-websettings.c:219 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:4841 +#: ../midori/midori-websettings.c:220 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:4844 +#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:294 +#: ../katze/katze-utils.c:571 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5331 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5338 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5340 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5364 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:5366 msgid "Run a web search" msgstr "Exevuta una cerca web" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:5387 msgid "Reopen a previously closed tab or window" -msgstr "" +msgstr "Reobrir una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:4877 -#, fuzzy +#: ../midori/midori-browser.c:5402 msgid "_Recently visited pages" -msgstr "Creua les pàgines visitades" +msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:5404 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Reobrir pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:5419 +#: ../midori/sokoke.c:934 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5421 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5436 msgid "_Tools" msgstr "_Eines" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5448 msgid "_Window" msgstr "_Finestra" -#: ../midori/midori-browser.c:4925 -#, fuzzy +#: ../midori/midori-browser.c:5450 msgid "Show a list of all open tabs" -msgstr "Mostra o amaga tots els diàlegs actius" +msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5464 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5466 msgid "Menu" msgstr "Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 -#, fuzzy +#: ../midori/midori-browser.c:5657 msgid "_Inline Find:" -msgstr "No s'ha pogut trobar «%s»" +msgstr "Cerca en _línia:" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:5688 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5693 msgid "Next" msgstr "Següent" -#: ../midori/midori-browser.c:5162 -#, fuzzy +#: ../midori/midori-browser.c:5698 msgid "Match Case" -msgstr "Coi_ncidència de majúscules i minúscules" +msgstr "Coincidència de majúscules i minúscules" -#: ../midori/midori-browser.c:5170 -#, fuzzy +#: ../midori/midori-browser.c:5707 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../midori/midori-browser.c:5180 -#, fuzzy +#: ../midori/midori-browser.c:5719 msgid "Close Findbar" -msgstr "no s'ha pogut tancar" +msgstr "Tanca la barra de cerques" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Suprimeix-ho tot" +#: ../midori/midori-browser.c:5763 +#: ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "Netejar-ho tot" -#: ../midori/midori-browser.c:5552 -#, fuzzy, c-format +#: ../midori/midori-browser.c:6118 +#, c-format msgid "Unexpected setting '%s'" -msgstr "en establir les dates de %s" +msgstr "Opció inesperada '%s'" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:979 #, c-format msgid "Search with %s" msgstr "Cerca amb %s" -#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 -#, fuzzy +#: ../midori/midori-panel.c:415 +#: ../midori/midori-panel.c:417 msgid "Detach chosen panel from the window" -msgstr "Mostra l'animació fora d'aquesta finestra de diàleg" +msgstr "Desenganxar el panell triat de la finestra" -#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 -#, fuzzy +#: ../midori/midori-panel.c:427 +#: ../midori/midori-panel.c:429 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" -msgstr "Horitzontal, creixent cap a la dreta" +msgstr "Alinear el panell lateral a la dreta" -#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:439 +#: ../midori/midori-panel.c:440 msgid "Close panel" msgstr "Tanca el quadre" -#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 -#, fuzzy +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" -msgstr "Horitzontal, creixent cap a l'esquerra" +msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:704 -#, fuzzy +#: ../midori/midori-panel.c:697 msgid "Show panel _titles" -msgstr "Mostra els títols" +msgstr "Mostra els _títols dels panells" -#: ../midori/midori-panel.c:712 -#, fuzzy +#: ../midori/midori-panel.c:704 msgid "Show operating _controls" -msgstr "Mostra/Amaga els controls" +msgstr "Mostra els _controls d'operació" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:793 msgid "Options" msgstr "Opcions" -#: ../midori/midori-websettings.c:197 -#, fuzzy +#: ../midori/midori-websettings.c:198 msgid "Show Blank page" -msgstr "Mostra la pàgina d'ajuda" +msgstr "Mostra pàgina en blanc" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "Mostra la pàgina d'inici" -#: ../midori/midori-websettings.c:199 -#, fuzzy +#: ../midori/midori-websettings.c:200 msgid "Show last open tabs" -msgstr "Obre un projecte" +msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:216 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "All cookies" msgstr "Totes les galetes" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:274 +#: ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:551 +#: ../extensions/shortcuts.c:94 msgid "None" msgstr "Cap" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:292 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 -#, fuzzy +#: ../midori/midori-websettings.c:346 msgid "Remember last window size" -msgstr "Empra la geometria de la darrera finestra" +msgstr "Recordar la mida de la darrera finestra" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:347 msgid "Whether to save the last window size" -msgstr "" +msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:352 -#, fuzzy +#: ../midori/midori-websettings.c:355 msgid "Last window width" -msgstr "Amplada de finestra desitjada" +msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:353 -#, fuzzy +#: ../midori/midori-websettings.c:356 msgid "The last saved window width" -msgstr "L'amplària per defecte de la finestra de l'aplicació" +msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:361 -#, fuzzy +#: ../midori/midori-websettings.c:364 msgid "Last window height" -msgstr "Alçada de finestra desitjada" +msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:362 -#, fuzzy +#: ../midori/midori-websettings.c:365 msgid "The last saved window height" -msgstr "L'alçada per defecte de la finestra de la bitàcola" +msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:387 -#, fuzzy +#: ../midori/midori-websettings.c:390 msgid "Last panel position" -msgstr "La posició de l'objecte al quadre" +msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:388 -#, fuzzy +#: ../midori/midori-websettings.c:391 msgid "The last saved panel position" -msgstr "La posició de l'objecte al quadre" +msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 -#, fuzzy +#: ../midori/midori-websettings.c:400 msgid "Last panel page" -msgstr "Mostra l'última pàgina" +msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:398 -#, fuzzy +#: ../midori/midori-websettings.c:401 msgid "The last saved panel page" -msgstr "Vés a l'última pàgina" +msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:406 -#, fuzzy +#: ../midori/midori-websettings.c:409 msgid "Last Web search" -msgstr "Cerca per Web" +msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:407 -#, fuzzy +#: ../midori/midori-websettings.c:410 msgid "The last saved Web search" -msgstr "Permet fe búsquedes a la web directament des del quadre" +msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:419 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:420 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:428 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:429 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:437 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:438 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:446 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:444 -#, fuzzy +#: ../midori/midori-websettings.c:447 msgid "Whether to show the panel" -msgstr "Si es mostrarà un indicador d'ordenació" +msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:462 msgid "Show Transferbar" msgstr "Mostra barra de fransferències" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the transferbar" msgstr "Si es mostrarà la barra de transferències" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:471 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:481 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:482 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:498 msgid "Show progress in location entry" -msgstr "" +msgstr "Mostrar el progrés a la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:499 msgid "Whether to show loading progress in the location entry" -msgstr "" +msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:514 msgid "Search engines in location completion" -msgstr "" +msgstr "Motors de cerca per a completar la cerca" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:515 msgid "Whether to show search engines in the location completion" -msgstr "" +msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:523 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:524 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:529 -#, fuzzy +#: ../midori/midori-websettings.c:532 msgid "Compact Sidepanel" -msgstr "Desplegament compacte" +msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:533 msgid "Whether to make the sidepanel compact" -msgstr "" +msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:545 -#, fuzzy +#: ../midori/midori-websettings.c:548 msgid "Show operating controls of the panel" -msgstr "Mostra/amaga el plafó de navegació" +msgstr "Mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:549 msgid "Whether to show the operating controls of the panel" -msgstr "" +msgstr "Si s'ha de mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:561 -#, fuzzy +#: ../midori/midori-websettings.c:564 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:562 -#, fuzzy +#: ../midori/midori-websettings.c:565 msgid "Whether to align the sidepanel on the right" -msgstr "Si s'ha de mostrar un mesurador de barra d'estat a la dreta" +msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:571 -#, fuzzy +#: ../midori/midori-websettings.c:574 msgid "When Midori starts:" -msgstr "Activa quan _s'inicia l'ordinador" +msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:575 msgid "What to do when Midori starts" -msgstr "" +msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:584 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:585 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:597 -#, fuzzy +#: ../midori/midori-websettings.c:600 msgid "Show crash dialog" -msgstr "Inhabilita el diàleg de fallades" +msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:601 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 -#, fuzzy +#: ../midori/midori-websettings.c:617 msgid "Show speed dial in new tabs" -msgstr "Si s'ha de mostrar la barra de menú a les noves finestres/pestanyes" +msgstr "Mostrar el marcador ràpid a les noves pestanyes" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:618 msgid "Show speed dial in newly opened tabs" -msgstr "" +msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" -#: ../midori/midori-websettings.c:623 -#, fuzzy +#: ../midori/midori-websettings.c:626 msgid "Save downloaded files to:" -msgstr " -P, --directory-prefix=PREFIX desa els fitxers a PREFIX/...\n" +msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:627 msgid "The folder downloaded files are saved to" -msgstr "" +msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:643 -#, fuzzy +#: ../midori/midori-websettings.c:648 msgid "Ask for the destination folder" -msgstr "Seleccioneu una carpeta per als podcasts" +msgstr "Demanar per la carpeta destí" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:649 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" +msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:668 msgid "Notify when a transfer has been completed" msgstr "Informa quan una transferència hagi finalitzat" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:669 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si es mostra una notificació quan acabi una transferència" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:681 msgid "Download Manager" msgstr "Gestor de descàrregues" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:682 msgid "An external download manager" msgstr "Un gestor de descàrregues extern" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:690 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:691 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:701 -#, fuzzy +#: ../midori/midori-websettings.c:706 msgid "News Aggregator" -msgstr "Agregador de RSS" +msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:702 -#, fuzzy +#: ../midori/midori-websettings.c:707 msgid "An external news aggregator" -msgstr "Font SunOS News" +msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:710 -#, fuzzy +#: ../midori/midori-websettings.c:719 msgid "Location entry Search" -msgstr "_Ubicació que s'ha de cercar:" +msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:720 msgid "The search to perform inside the location entry" -msgstr "" +msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:719 -#, fuzzy +#: ../midori/midori-websettings.c:728 msgid "Preferred Encoding" -msgstr "La codificació no és vàlida." +msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:720 -#, fuzzy +#: ../midori/midori-websettings.c:729 msgid "The preferred character encoding" -msgstr "Codificació del joc de caràcters de la BD" +msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:730 -#, fuzzy +#: ../midori/midori-websettings.c:739 msgid "Always Show Tabbar" -msgstr "Mostra sempre la Clutterbar " +msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:731 -#, fuzzy +#: ../midori/midori-websettings.c:740 msgid "Always show the tabbar" -msgstr "Mostra sempre la Clutterbar " +msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:739 -#, fuzzy +#: ../midori/midori-websettings.c:748 msgid "Close Buttons on Tabs" -msgstr "Mostar el botó de _tancar a les pestanyes" +msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:740 -#, fuzzy +#: ../midori/midori-websettings.c:749 msgid "Whether tabs have close buttons" -msgstr "Mostra els botons per tancar pestanyes" +msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:748 -#, fuzzy +#: ../midori/midori-websettings.c:757 msgid "Open new pages in:" -msgstr "Obre en una finestra nova" +msgstr "Obrir les noves pàgines a:" -#: ../midori/midori-websettings.c:749 -#, fuzzy +#: ../midori/midori-websettings.c:758 msgid "Where to open new pages" -msgstr "No s'ha pogut obrir una nova sessió." +msgstr "On s'han d'obrir les noves pàgines" -#: ../midori/midori-websettings.c:758 -#, fuzzy +#: ../midori/midori-websettings.c:771 msgid "Open external pages in:" -msgstr "El nombre de pàgines del document." +msgstr "Obrir pàgines externes a:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:772 msgid "Where to open externally opened pages" -msgstr "" +msgstr "On obrir les pàgines obertes de forma externa" -#: ../midori/midori-websettings.c:768 -#, fuzzy +#: ../midori/midori-websettings.c:785 msgid "Middle click opens Selection" -msgstr "Cliqueu per a completar la selecció" +msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:786 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:777 -#, fuzzy +#: ../midori/midori-websettings.c:794 msgid "Open tabs in the background" -msgstr "Obre els equips en noves pestanyes" +msgstr "Obrir pestanyes al fons" -#: ../midori/midori-websettings.c:778 -#, fuzzy +#: ../midori/midori-websettings.c:795 msgid "Whether to open new tabs in the background" -msgstr "Si s'ha de mostrar la barra de menú a les noves finestres/pestanyes" +msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:786 -#, fuzzy +#: ../midori/midori-websettings.c:803 msgid "Open Tabs next to Current" -msgstr "no es pot obrir l'actual fitxer d'opcions «%.250s»" +msgstr "Obrir les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:804 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:795 -#, fuzzy +#: ../midori/midori-websettings.c:812 msgid "Open popups in tabs" -msgstr "Obre els equips en noves pestanyes" +msgstr "Obrir missatges emergents a pestanyes" -#: ../midori/midori-websettings.c:796 -#, fuzzy +#: ../midori/midori-websettings.c:813 msgid "Whether to open popup windows in tabs" -msgstr "Si s'ha de mostrar la barra de menú a les noves finestres/pestanyes" +msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:812 -#, fuzzy +#: ../midori/midori-websettings.c:823 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Carrega les imatges automàticament" + +#: ../midori/midori-websettings.c:824 +msgid "Load and display images automatically" +msgstr "Carrega i mostra les imatges automàticament" + +#: ../midori/midori-websettings.c:831 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Habilita els scripts" + +#: ../midori/midori-websettings.c:832 +msgid "Enable embedded scripting languages" +msgstr "Habilita els llenguatges d'script incrustats" + +#: ../midori/midori-websettings.c:839 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Habilita els connectors de netscape" + +#: ../midori/midori-websettings.c:840 +msgid "Enable embedded Netscape plugin objects" +msgstr "Activar els objectes de connexió integrats de Netscape" + +#: ../midori/midori-websettings.c:855 msgid "Zoom Text and Images" -msgstr "Text i contrasenya de només lectura" +msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:856 msgid "Whether to zoom text and images" -msgstr "" +msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:828 -#, fuzzy +#: ../midori/midori-websettings.c:871 msgid "Find inline while typing" -msgstr "S'ha produït un error en cercar el directori /@l: %m\n" +msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:872 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "Si es buscarà automàticament a mesura que s'escriu" + +#: ../midori/midori-websettings.c:887 +msgid "Kinetic scrolling" +msgstr "Desplaçament cinètic" + +#: ../midori/midori-websettings.c:888 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:896 msgid "Accept cookies" msgstr "Accepta galetes" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:897 msgid "What type of cookies to accept" -msgstr "" +msgstr "Quins tipus de galetes s'accepten" -#: ../midori/midori-websettings.c:847 -#, fuzzy +#: ../midori/midori-websettings.c:906 msgid "Original cookies only" -msgstr "obtindre sols lectura" +msgstr "Només galetes originals" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:907 msgid "Accept cookies from the original website only" -msgstr "" +msgstr "Accepta només galetes del seu lloc web original" -#: ../midori/midori-websettings.c:856 -#, fuzzy +#: ../midori/midori-websettings.c:915 msgid "Maximum cookie age" -msgstr "Duració màxima de la contrasenya" +msgstr "Edat màxima de la galeta" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:916 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:867 -#, fuzzy +#: ../midori/midori-websettings.c:926 msgid "Remember last visited pages" -msgstr "Creua les pàgines visitades" +msgstr "Recordar les darreres pàgines visitades" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:927 msgid "Whether the last visited pages are saved" -msgstr "" +msgstr "Si les darreres pàgines visitades es desaran" -#: ../midori/midori-websettings.c:876 -#, fuzzy +#: ../midori/midori-websettings.c:935 msgid "Maximum history age" -msgstr "Duració màxima de la contrasenya" +msgstr "Edat màxima de l'historial" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:936 msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:885 -#, fuzzy -msgid "Remember last form inputs" -msgstr "Empra la geometria de la darrera finestra" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "" +msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:894 -#, fuzzy +#: ../midori/midori-websettings.c:944 msgid "Remember last downloaded files" -msgstr "S'estan suprimint els fitxers baixats obsolets" +msgstr "Recordar els darrers fitxers descarregats" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:945 msgid "Whether the last downloaded files are saved" -msgstr "" +msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:955 msgid "Proxy Server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:956 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "El servidor proxy usat per a les connexions HTTP" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:971 msgid "Detect proxy server automatically" msgstr "Detecta automàticament el servidor intermediari" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:972 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" +msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 -#, fuzzy +#: ../midori/midori-websettings.c:988 msgid "Identify as" -msgstr "Desa _com" +msgstr "Identifica com" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:989 msgid "What to identify as to web pages" -msgstr "" +msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:955 -#, fuzzy +#: ../midori/midori-websettings.c:1005 msgid "Identification string" -msgstr "la cadena no és terminada" +msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:956 -#, fuzzy +#: ../midori/midori-websettings.c:1006 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:964 -#, fuzzy -msgid "Cache size" -msgstr "Mida de la memòria cau:" - -#: ../midori/midori-websettings.c:965 -#, fuzzy -msgid "The allowed size of the cache" -msgstr "Mida de la memòria cau de mosàics:" - -#: ../midori/midori-websettings.c:980 -#, fuzzy +#: ../midori/midori-websettings.c:1021 msgid "Clear private data" -msgstr "Transferéncia de dades cancel·lada.\n" +msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1022 msgid "The private data selected for deletion" -msgstr "" +msgstr "La selecció de dades privades per a esborrar" -#: ../midori/midori-view.c:781 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:3773 +#: ../midori/midori-view.c:3777 +#, c-format +msgid "Error - %s" +msgstr "Error - %s" + +#: ../midori/midori-view.c:912 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, -#. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:783 ../midori/midori-view.c:3013 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Error" - -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:917 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 ../midori/midori-view.c:3017 +#: ../midori/midori-view.c:950 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1164 +#: ../midori/midori-view.c:1878 +#, c-format +msgid "Send a message to %s" +msgstr "Enviar un missatge a %s" + +#: ../midori/midori-view.c:1717 +#: ../midori/midori-view.c:1780 msgid "Open _Link" msgstr "Obre l'_enllaç" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1720 +#: ../midori/midori-view.c:1782 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1723 +#: ../midori/midori-view.c:1789 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Descarrega el destí de l'enllaç" +#: ../midori/midori-view.c:1726 +msgid "_Copy Link destination" +msgstr "_Copiar la destinació de l'enllaç" -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1729 +#: ../midori/midori-view.c:1801 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1730 +#: ../midori/midori-view.c:1795 +msgid "_Download Link destination" +msgstr "_Descarrega el destí de l'enllaç" + +#: ../midori/midori-view.c:1734 +#: ../midori/midori-view.c:1770 +#: ../midori/midori-view.c:1806 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:1746 +msgid "Open _Image in New Tab" +msgstr "Obrir la _imatge en una nova pestanya" + +#: ../midori/midori-view.c:1749 +msgid "Open Image in New Wi_ndow" +msgstr "Obrir la imatge en una nova fi_nestra" + +#: ../midori/midori-view.c:1752 +msgid "Copy Image _Address" +msgstr "Copiar l'_adreça de la imatge" + +#: ../midori/midori-view.c:1755 +msgid "Save I_mage" +msgstr "Desar I_matge" + +#: ../midori/midori-view.c:1756 +msgid "Download I_mage" +msgstr "Descarregar I_matge" + +#: ../midori/midori-view.c:1763 +msgid "Copy Video _Address" +msgstr "Copiar l'_adreça del vídeo" + +#: ../midori/midori-view.c:1766 +msgid "Save _Video" +msgstr "Desar _vídeo" + +#: ../midori/midori-view.c:1766 +msgid "Download _Video" +msgstr "Descarregar _vídeo" + +#: ../midori/midori-view.c:1826 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1854 +#: ../midori/midori-view.c:1865 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:1316 +#: ../midori/midori-view.c:1886 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:1494 +#: ../midori/midori-view.c:2145 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-view.c:2162 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-view.c:2165 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-view.c:2169 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:2685 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:2147 -#, fuzzy +#: ../midori/midori-view.c:2896 msgid "Speed dial" -msgstr "Tipus _de marcatge:" +msgstr "Marcador ràpid" -#: ../midori/midori-view.c:2148 -#, fuzzy +#: ../midori/midori-view.c:2897 msgid "Click to add a shortcut" -msgstr "No s'ha pogut afegir una drecera nova" +msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:2149 -#, fuzzy +#: ../midori/midori-view.c:2898 msgid "Enter shortcut address" -msgstr "Introduïu una adreça electrònica" +msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:2150 -#, fuzzy +#: ../midori/midori-view.c:2899 msgid "Enter shortcut title" -msgstr "Introduïu el títol de la cançó." +msgstr "Introdueix un títol per a la drecera" -#: ../midori/midori-view.c:2151 -#, fuzzy +#: ../midori/midori-view.c:2900 msgid "Are you sure you want to delete this shortcut?" -msgstr "Esteu segur que voleu suprimir aquest compartit?" +msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:2181 -#, fuzzy, c-format +#: ../midori/midori-view.c:2930 +#, c-format msgid "Document cannot be displayed" -msgstr "No es pot comprovar la validesa del document \"%s\"." +msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:2198 -#, fuzzy, c-format +#: ../midori/midori-view.c:2947 +#, c-format msgid "No documentation installed" -msgstr "No s'han pogut trobar plantilles" +msgstr "No s'ha instal·lat la documentació" -#: ../midori/midori-view.c:2323 +#: ../midori/midori-view.c:3072 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:2551 ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Nova _pestanya" - -#: ../midori/midori-view.c:2565 +#: ../midori/midori-view.c:3315 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3320 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3320 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Preferències per a %s" +#: ../midori/midori-view.c:3879 +msgid "Print background images" +msgstr "Imprimeix les imatges de fons" + +#: ../midori/midori-view.c:3880 +msgid "Whether background images should be printed" +msgstr "Si s'han d'imprimir les imatges de fons" + +#: ../midori/midori-view.c:3924 +#: ../midori/midori-preferences.c:388 +msgid "Features" +msgstr "Característiques" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:317 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:318 msgid "Startup" msgstr "Inicialització" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:332 msgid "Use current page as homepage" -msgstr "" +msgstr "Usar la pàgina actual com a pàgina d'inici" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:341 +#: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferències" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:356 msgid "Appearance" msgstr "Aparença" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:357 msgid "Font settings" msgstr "Paràmetres del tipus de lletra" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:359 msgid "Default Font Family" msgstr "Família de tipus de lletra per defecte" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:362 msgid "The default font family used to display text" msgstr "La família de tipus de lletra per defecte emprada per mostrar el text" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:365 msgid "The default font size used to display text" msgstr "La mida del tipus de lletra per defecte emprada per mostrar el text" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:367 msgid "Fixed-width Font Family" msgstr "Família de tipus de lletra d'amplada fixa" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:370 msgid "The font family used to display fixed-width text" -msgstr "" +msgstr "La família de fonts per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:373 msgid "The font size used to display fixed-width text" -msgstr "" +msgstr "La mida de la font usada per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:375 msgid "Minimum Font Size" msgstr "Mida mínima del tipus de lletra" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:378 msgid "The minimum font size used to display text" msgstr "La mida mínima del tipus de lletra emprada per mostrar text" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Codificació" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "La codificació de caràcters per defecte" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:387 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Característiques" - -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Carrega les imatges automàticament" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Carrega i mostra les imatges automàticament" - -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:400 msgid "Shrink images automatically" msgstr "Encongeix les imatges automàticament" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:401 msgid "Automatically shrink standalone images to fit" -msgstr "" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Imprimeix les imatges de fons" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Si s'han d'imprimir les imatges de fons" - -#: ../midori/midori-preferences.c:499 -#, fuzzy -msgid "Resizable text areas" -msgstr "/Àrees de mascara _seleccionades" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Habilita els scripts" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Habilita els llenguatges d'script incrustats" - -#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Habilita els connectors de netscape" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "" +msgstr "Reduir les imatges automàticament per a encabir-les" -#: ../midori/midori-preferences.c:511 -#, fuzzy +#: ../midori/midori-preferences.c:413 msgid "Enforce 96 dots per inch" -msgstr "Resolució de la pantalla (punts per polzada)" +msgstr "Força 96 PPP" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:414 msgid "Enforce a video dot density of 96 DPI" -msgstr "" +msgstr "Forçar una densitat de punt de 96 PPP" -#: ../midori/midori-preferences.c:515 -#, fuzzy +#: ../midori/midori-preferences.c:417 msgid "Enable developer tools" -msgstr "/Eines/Esborra la cache" +msgstr "Activa les eines per a desenvolupadors" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:418 msgid "Enable special extensions for developers" -msgstr "" +msgstr "Activa extensions especials per a desenvolupadors" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:428 msgid "Spell Checking" msgstr "Corrector ortogràfic" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:430 msgid "Enable Spell Checking" msgstr "Habilita el corrector ortogràfic" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:431 msgid "Enable spell checking while typing" -msgstr "" +msgstr "Activar la comprovació ortogràfica mentre s'escriu" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" +#: ../midori/midori-preferences.c:435 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Una llista d'idiomes separats per coma que seran usats per a la correcció ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:443 msgid "Interface" msgstr "Interfície" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:444 msgid "Navigationbar" msgstr "Barra de navegació" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:454 msgid "Browsing" msgstr "Navegant" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:476 msgid "Applications" msgstr "Aplicacions" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:477 msgid "External applications" msgstr "Aplicacions externes" #. Page "Network" -#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:494 msgid "Network" msgstr "Xarxa" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Privacitat" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Galetes de web" -#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:532 msgid "days" msgstr "dies" -#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 +#: ../midori/midori-searchaction.c:488 +#: ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "Buit" @@ -1843,59 +1857,69 @@ msgstr "Gestiona els ginys de cerca" msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 -#, fuzzy +#: ../midori/sokoke.c:167 msgid "Could not run external program." -msgstr "No s'ha pogut executar %s a la columna %d" +msgstr "No s'ha pogut executar el programa extern." -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:933 msgid "_Bookmark" msgstr "_Adreça d'interès" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:935 msgid "Add Boo_kmark" msgstr "Afegeix adreça d'_interès" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:936 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:937 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:938 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:939 msgid "_Homepage" msgstr "_Pàgina d'inici" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:940 msgid "_Userscripts" msgstr "Scripts d'_usuari" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "E_stils personals" +#: ../midori/sokoke.c:941 +msgid "New _Tab" +msgstr "Nova _pestanya" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:942 msgid "_Transfers" msgstr "_Transferències" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:943 msgid "Netscape p_lugins" msgstr "_Connectors de Netscape" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 +#: ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Scripts d'usuari" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Estils d'usuari" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a la carpeta %s." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "No es pot seguir la pista de la carpeta '%s': %s" + #: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Adreces d'interès" @@ -1929,147 +1953,160 @@ msgid "Are you sure you want to remove all history items?" msgstr "Voler esborrar tots els elements de l’historial?" #: ../panels/midori-history.c:217 -#, fuzzy msgid "Bookmark the selected history item" -msgstr "Mou l'element seleccionat cap amunt" +msgstr "Afegeix l'ítem seleccionat de l'historial a les adreces d'interès" #: ../panels/midori-history.c:226 -#, fuzzy msgid "Delete the selected history item" -msgstr "Mou l'element seleccionat cap amunt" +msgstr "Esborra l'ítem de l'historial seleccionat" #: ../panels/midori-history.c:234 -#, fuzzy msgid "Clear the entire history" -msgstr "Buida la llista de fitxers recents" +msgstr "Buida l'historial" + +#: ../panels/midori-history.c:600 +msgid "Erroneous clock time" +msgstr "Rellotge erroni" #: ../panels/midori-history.c:601 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual." + +#: ../panels/midori-history.c:613 msgid "A week ago" msgstr "Setmana passada" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:618 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Fa %d dia" msgstr[1] "Fa %d dies" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:626 msgid "Today" msgstr "Avuí" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:628 msgid "Yesterday" msgstr "Ahir" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Connectors de Netscape" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../panels/midori-transfers.c:479 -#, fuzzy +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" -msgstr "_Obre la carpeta de destinació després de l'extracció" +msgstr "_Obrir la carpeta destí" -#: ../panels/midori-transfers.c:482 -#, fuzzy +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" -msgstr "no es pot copiar l'enllaç simbòlic cíclic %s" +msgstr "Copiar la localització de l'enllaç" -#: ../katze/katze-http-auth.c:97 -#, fuzzy +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "Es requereix autenticació" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"És necessari un nom d'usuari i una contrasenya\n" +"per a obrir aquesta ubicació:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Nom d'usuari" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Contrasenya" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "_Recordar contrasenya" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "La icona amb nom '%s' no s'ha pogut carregar" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +msgstr "La icona '%s' no s'ha pogut carregar" #: ../katze/katze-throbber.c:907 -#, fuzzy msgid "Animation frames are broken" -msgstr "Els paquets següents contenen errors." +msgstr "Els marcs d'animació no funcionen correctament" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 -#, fuzzy, c-format +#: ../katze/katze-utils.c:393 +#: ../katze/katze-utils.c:769 +#, c-format msgid "Property '%s' is invalid for %s" -msgstr "El tipus %s per a la propietat %s no és vàlid" +msgstr "La propietat '%s' no és vàlida per a %s" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:439 +#: ../katze/katze-utils.c:468 msgid "Choose file" msgstr "Seleccioneu fitxer" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:454 msgid "Choose folder" msgstr "Seleccioneu carpeta" -#: ../extensions/adblock.c:167 -#, fuzzy +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "Preferències per a %s" + +#: ../extensions/adblock.c:345 msgid "Configure Advertisement filters" -msgstr "Configura els filtres de visualització de colors" +msgstr "Configura els filtres de publicitat" -#: ../extensions/adblock.c:304 -#, fuzzy +#: ../extensions/adblock.c:375 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." + +#: ../extensions/adblock.c:513 msgid "Configure _Advertisement filters..." -msgstr "Configura els filtres de visualització de colors" +msgstr "Configura els filtres de _publicitat..." -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:922 msgid "Advertisement blocker" -msgstr "" +msgstr "Bloqueig de publicitat" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:923 msgid "Block advertisements according to a filter list" -msgstr "" +msgstr "Blocar els anuncis publicitaris segons una llista de filtres" #: ../extensions/colorful-tabs.c:115 -#, fuzzy msgid "Tint tabs distinctly" -msgstr "es&Borra els tabuladors amb la tecla de retrocés" +msgstr "Aplica un color diferent a les pestanyes" #: ../extensions/colorful-tabs.c:151 -#, fuzzy msgid "Colorful Tabs" -msgstr "els separadors no són compatibles" +msgstr "Pestanyes de colors" #: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" -msgstr "" +msgstr "Aplicar un color diferent a cadascuna de les pestanyes" #: ../extensions/cookie-manager/cookie-manager-page.c:79 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Gestor de galetes" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Suprimeix-ho tot" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Esborra totes les galetes mostrades. Si hi ha un filtre establert, només aquelles galetes que coincideixin amb el filtre s'esborraran." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" @@ -2089,7 +2126,7 @@ msgstr "Qüestió" #: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." -msgstr "" +msgstr "Només s'esborraran les galetes que coincideixin amb el filtre." #: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" @@ -2137,10 +2174,8 @@ msgid "Filter:" msgstr "Filtre:" #: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que coincideixi amb el filtre" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2150,13 +2185,21 @@ msgstr "_Gestor de galetes" msgid "List, view and delete cookies" msgstr "Llista, mostra i borra galetes" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Precarregar DNS" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Precarregar les adreces IP dels enllaços" + +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "No s'han pogut trobar elements Atom \"feed\" en les dades XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2165,40 +2208,40 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Darrera actualització: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Canals" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Afegeix un nou canal" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Suprimeix el canal" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Canals" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "" +msgstr "No s'ha pogut trobar l'element arrel en les dades XML." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Format de canal no compatible." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "No s'ha pogut analitzar el canal XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" +msgstr "No s'ha pogut trobar l'element \"channel\" en les dades RSS XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2206,64 +2249,91 @@ msgstr "Versió RSS no compatible." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "No s'ha pogut trobar els elements RSS \"item\" en les dades XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" +msgstr "No s'ha pogut trobar els elements RSS \"channel\" en les dades XML." + +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Error" -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" msgstr "El canal «%s» ja existeix." -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" msgstr "Error en carregar el canal «%s»" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Nou canal" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "Quadre de canals" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "No s'ha pogut afegir un valor al formulari: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "Emmagatzema l'historial de les dades introduïdes als formularis" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "No disponible: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "Els fitxers de recursos no estan instal·lats" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "Omplir el formulari de l'historial" + +#: ../extensions/mouse-gestures/main.c:246 msgid "Mouse Gestures" msgstr "Gesticulacions de ratolí" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures/main.c:247 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "Control·lar Midori usant el ratolí" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "Contenidor de la pàgina" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "" +msgstr "Contenidor de la _pàgina" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Mantenir un o múltiples pàgines obertes a les pestanyes en paral·lel" + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "Configura les dreceres de teclat" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "Configura les _dreceres…" -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Dreceres" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Mostra i edita les dreceres del teclat" @@ -2281,31 +2351,36 @@ msgstr "Característiques de la la barra d'estat" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "" +msgstr "Activar o desactivar fàcilment funcionalitats en planes web" -#: ../extensions/tab-panel.c:383 ../extensions/tab-panel.c:443 +#: ../extensions/tab-panel.c:562 +#: ../extensions/tab-panel.c:619 msgid "Tab Panel" msgstr "Quadre de pestanyes" -#: ../extensions/tab-panel.c:427 +#: ../extensions/tab-panel.c:603 msgid "T_ab Panel" msgstr "Quadre de _pestanyes" -#: ../extensions/tab-panel.c:444 +#: ../extensions/tab-panel.c:620 msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "Pestanya amb la llista de l'historial" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permet de canviar de pestanya triant-la d'una llista ordenada pel darrer ús" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" #: ../extensions/toolbar-editor.c:407 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Selecciona els elements mostrats a la barra d'eines. Els elements poden ser " -"ordenats arrossegant-los." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selecciona els elements mostrats a la barra d'eines. Els elements poden ser ordenats arrossegant-los." #: ../extensions/toolbar-editor.c:423 msgid "Available Items" @@ -2319,10 +2394,44 @@ msgstr "Elements Mostrats" msgid "Customize _Toolbar..." msgstr "Personalitza la barra d'_eines…" -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "Editor de la barra d'eines" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "Editar fàcilment la distribució de la barra d'eines" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "No disponible en aquesta plataforma" + +#: ../extensions/web-cache.c:583 +msgid "Web Cache" +msgstr "Memòria cau Web" + +#: ../extensions/web-cache.c:584 +msgid "Cache HTTP communication on disk" +msgstr "Emprar el disc com a memòria cau de comunicacions HTTP" + +#~ msgid "Remember last form inputs" +#~ msgstr "Recordar les darreres entrades dels formularis" +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Si les entrades dels darrers formularis s'han d'emmagatzemar" +#~ msgid "Cache size" +#~ msgstr "Mida de la memòria cau" +#~ msgid "The allowed size of the cache" +#~ msgstr "Mida límit de la memòria cau" +#~ msgid "Encoding" +#~ msgstr "Codificació" +#~ msgid "The character encoding to use by default" +#~ msgstr "La codificació de caràcters per defecte" +#~ msgid "Resizable text areas" +#~ msgstr "Àrees de text de mida modificable" +#~ msgid "Whether text areas are resizable" +#~ msgstr "Si es pot canviar la mida de les àrees de text" +#~ msgid "MB" +#~ msgstr "MB" +#~ msgid "User_styles" +#~ msgstr "E_stils personals" + diff --git a/po/cs.po b/po/cs.po index f33aba0c..12df751d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,27 +5,26 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.9\n" +"Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 23:58+0200\n" -"PO-Revision-Date: 2009-07-30 09:38+0100\n" +"POT-Creation-Date: 2009-12-10 07:48+0100\n" +"PO-Revision-Date: 2009-12-10 07:49+0100\n" "Last-Translator: David Štancl \n" -"Language-Team: Czech\n" +"Language-Team: Czech < >\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Poedit-Language: Czech\n" +"X-Poedit-Country: CZECH REPUBLIC\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1343 -#: ../midori/main.c:1517 -#: ../midori/main.c:1525 -#: ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1494 ../midori/main.c:1692 +#: ../midori/main.c:1700 ../midori/main.c:1711 +#: ../midori/midori-websettings.c:292 msgid "Midori" msgstr "Midori" @@ -33,1815 +32,1919 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetový prohlížeč" -#: ../midori/main.c:96 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurace nemůže být načtena: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Hodnota '%s' je pro %s špatná" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:169 ../midori/main.c:255 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:350 +#: ../midori/main.c:379 ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" -#: ../midori/main.c:382 +#: ../midori/main.c:411 ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:465 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:489 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nepodařilo se smazat historii: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:512 ../midori/main.c:546 ../midori/main.c:562 #, c-format msgid "Failed to add history item: %s\n" msgstr "Nepodařilo se přidat položku do historie: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:741 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nepodařilo se odstranit staré položky historie: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:770 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurace nemůže být uložena. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:808 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhledávací nástroj nemůže být uložen. %s" -#: ../midori/main.c:798 -#: ../midori/main.c:826 -#: ../midori/main.c:855 +#: ../midori/main.c:827 ../midori/main.c:855 ../midori/main.c:884 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nemohou být uloženy. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 -#: ../midori/main.c:901 +#: ../midori/main.c:907 ../midori/main.c:930 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:999 ../midori/main.c:1171 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:1101 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti." +#: ../midori/main.c:1209 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává " +"opakovaně, pro odstranění problému zkuste následující možnosti." -#: ../midori/main.c:1116 +#: ../midori/main.c:1224 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:1120 +#: ../midori/main.c:1228 msgid "Reset the last _session" msgstr "Vymazat poslední _sezení" -#: ../midori/main.c:1125 +#: ../midori/main.c:1233 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1343 +#: ../midori/main.c:1398 ../midori/main.c:1925 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sezení nemůže být načteno: %s\n" + +#: ../midori/main.c:1494 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1366 +#: ../midori/main.c:1517 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1398 +#: ../midori/main.c:1549 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1608 msgid "Run ADDRESS as a web application" msgstr "Spustit ADDRESS jako webovou aplikaci" -#: ../midori/main.c:1447 +#: ../midori/main.c:1608 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1449 +#: ../midori/main.c:1611 msgid "Use FOLDER as configuration folder" msgstr "Použít FOLDER jako místo pro uložení konfigurace" -#: ../midori/main.c:1449 +#: ../midori/main.c:1611 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1451 +#: ../midori/main.c:1614 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1617 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1457 +#: ../midori/main.c:1620 msgid "Execute the specified command" msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1459 +#: ../midori/main.c:1622 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1461 +#: ../midori/main.c:1624 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1514 +#: ../midori/main.c:1689 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1712 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1539 +#: ../midori/main.c:1714 msgid "Check for new versions at:" -msgstr "Zjistit nové verze v:" +msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1619 +#: ../midori/main.c:1796 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1655 +#: ../midori/main.c:1844 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1892 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1910 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1742 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sezení nemůže být načteno: %s\n" - -#: ../midori/main.c:1755 +#: ../midori/main.c:1938 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:1951 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:1963 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1979 msgid "_Ignore" msgstr "_Ignorovat" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:422 msgid "File not found." msgstr "Soubor nebyl nalezen." -#: ../midori/midori-array.c:258 -#: ../midori/midori-array.c:267 +#: ../midori/midori-array.c:456 ../midori/midori-array.c:479 +#: ../midori/midori-array.c:489 msgid "Malformed document." msgstr "Nesprávný formát dokumentu." -#: ../midori/midori-array.c:429 -#: ../midori/sokoke.c:694 +#: ../midori/midori-array.c:498 +msgid "Unrecognized bookmark format." +msgstr "Neznámý formát záložek." + +#: ../midori/midori-array.c:712 ../midori/sokoke.c:955 #, c-format msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:4969 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4966 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:474 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:675 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:675 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:677 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:677 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:707 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:661 -#: ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:720 ../midori/midori-searchaction.c:967 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:680 -#: ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:739 ../midori/midori-searchaction.c:981 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:4214 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:704 -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:779 ../midori/midori-browser.c:855 +#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:4251 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:808 +msgid "Show in the tool_bar" +msgstr "Zobrazit v _nástrojové liště" + +#: ../midori/midori-browser.c:823 +msgid "Run as _web application" +msgstr "Spustit jako _webovou aplikaci" + +#: ../midori/midori-browser.c:931 ../midori/midori-browser.c:4269 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1172 +#: ../midori/midori-browser.c:1298 ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" + +#: ../midori/midori-browser.c:1334 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../midori/midori-browser.c:1176 +#: ../midori/midori-browser.c:1338 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1478 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:2177 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:3430 -#: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2253 ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nový kanál" + +#: ../midori/midori-browser.c:2286 ../midori/midori-browser.c:5010 +#: ../panels/midori-bookmarks.c:243 +msgid "Add a new bookmark" +msgstr "Přidat novou záložku" + +#: ../midori/midori-browser.c:2847 ../midori/midori-searchaction.c:491 +msgid "Empty" +msgstr "Prázdné" + +#: ../midori/midori-browser.c:3441 ../midori/sokoke.c:275 +#: ../midori/sokoke.c:285 ../midori/sokoke.c:313 ../midori/sokoke.c:335 +#: ../midori/sokoke.c:349 +msgid "Could not run external program." +msgstr "Nemohu spustit externí program." + +#: ../midori/midori-browser.c:3954 ../panels/midori-bookmarks.c:796 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:3437 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3961 ../panels/midori-bookmarks.c:802 +#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:3440 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3964 ../panels/midori-bookmarks.c:804 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4143 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4144 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4145 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4146 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4147 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4167 ../panels/midori-bookmarks.c:272 +msgid "Import bookmarks..." +msgstr "Importovat záložky..." + +#: ../midori/midori-browser.c:4170 ../midori/midori-browser.c:5015 +msgid "_Import bookmarks" +msgstr "_Importovat záložky" + +#: ../midori/midori-browser.c:4180 +msgid "_Application:" +msgstr "_Aplikace:" + +#: ../midori/midori-browser.c:4206 ../midori/midori-browser.c:5114 +#: ../midori/midori-websettings.c:223 ../midori/midori-websettings.c:297 +#: ../katze/katze-utils.c:672 +msgid "Custom..." +msgstr "Vlastní..." + +#: ../midori/midori-browser.c:4280 +msgid "Failed to import bookmarks" +msgstr "Nepodařilo se naimportovat záložky" + +#: ../midori/midori-browser.c:4426 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:3754 +#: ../midori/midori-browser.c:4430 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4443 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:3777 -#: ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:4453 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4458 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:3787 +#: ../midori/midori-browser.c:4463 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:3792 +#: ../midori/midori-browser.c:4468 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:3797 -#: ../midori/sokoke.c:868 +#: ../midori/midori-browser.c:4473 ../midori/sokoke.c:1114 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4478 ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "Keš stránek" + +#: ../midori/midori-browser.c:4486 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4582 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4598 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4880 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:4165 -#: ../midori/sokoke.c:869 +#: ../midori/midori-browser.c:4882 ../midori/sokoke.c:1115 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4883 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:4169 +#: ../midori/midori-browser.c:4886 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:4889 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4892 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4894 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:4178 +#: ../midori/midori-browser.c:4895 msgid "Add shortcut to speed dial" -msgstr "Kliknutím přidáte záložku" +msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:4897 +msgid "Add Shortcut to the _desktop" +msgstr "Přidat záložku na _plochu" + +#: ../midori/midori-browser.c:4898 +msgid "Add shortcut to the desktop" +msgstr "Přidá záložku na plochu" + +#: ../midori/midori-browser.c:4900 +msgid "Subscribe to News _feed" +msgstr "Přidat _kanál" + +#: ../midori/midori-browser.c:4901 +msgid "Subscribe to this news feed" +msgstr "Přidá tento kanál do odebíraných kanálů" + +#: ../midori/midori-browser.c:4906 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4907 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:4909 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:4184 +#: ../midori/midori-browser.c:4910 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:4913 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:4190 +#: ../midori/midori-browser.c:4916 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4918 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:4195 +#: ../midori/midori-browser.c:4922 +msgid "Undo the last modification" +msgstr "Vrátit zpět poslední změnu" + +#: ../midori/midori-browser.c:4925 +msgid "Redo the last modification" +msgstr "Vrátit poslední změnu" + +#: ../midori/midori-browser.c:4929 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:4198 -#: ../midori/midori-browser.c:4201 +#: ../midori/midori-browser.c:4932 ../midori/midori-browser.c:4935 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:4938 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:4207 +#: ../midori/midori-browser.c:4941 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:4210 +#: ../midori/midori-browser.c:4944 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:4947 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4949 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4950 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4952 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4953 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4957 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4959 msgid "_View" -msgstr "_Pohled" +msgstr "_Zobrazit" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4960 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4972 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:4975 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4978 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4979 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4981 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4982 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4984 msgid "View Selection Source" msgstr "Zobrazit zdrojový kód výběru" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4985 msgid "View the source code of the selection" msgstr "Zobrazit zdrojový kód vybraného textu" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4989 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4991 msgid "_Go" -msgstr "_Jít" +msgstr "_Přejít" -#: ../midori/midori-browser.c:4260 +#: ../midori/midori-browser.c:4994 msgid "Go back to the previous page" -msgstr "Jít zpět (na předchozí stránku)" +msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:4997 msgid "Go forward to the next page" -msgstr "Jít vpřed (na následující stránku)" +msgstr "Přejít vpřed (na následující stránku)" -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:5000 msgid "Go to your homepage" -msgstr "Jít na domovskou stránku" +msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:5002 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:4269 +#: ../midori/midori-browser.c:5003 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:5005 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:5006 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:4276 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Přidat novou záložku" - -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:5012 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:5013 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:4281 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5018 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:5019 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:5022 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:5023 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:5027 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:5028 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:5030 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:5031 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:5033 +msgid "Focus _Current Tab" +msgstr "Zaměřit _aktuální kartu" + +#: ../midori/midori-browser.c:5034 +msgid "Focus the current tab" +msgstr "Zaměří aktuální kartu" + +#: ../midori/midori-browser.c:5036 +msgid "Open last _session" +msgstr "Otevřít poslední _sezení" + +#: ../midori/midori-browser.c:5037 +msgid "Open the tabs saved in the last session" +msgstr "Otevře karty uložené při posledním sezení" + +#: ../midori/midori-browser.c:5039 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:5041 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:5042 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:5044 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:5045 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:5047 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:5048 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:5051 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:4315 +#: ../midori/midori-browser.c:5058 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:5059 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:5064 msgid "_Menubar" -msgstr "_Menu" +msgstr "_Nabídka" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:5065 msgid "Show menubar" -msgstr "Zobrazit menu" +msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:5068 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:5069 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:5072 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:5073 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:5076 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:5077 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:5080 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:4338 +#: ../midori/midori-browser.c:5081 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:5084 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:5085 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:5092 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:4352 -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:5095 ../midori/midori-websettings.c:217 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:5099 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:4359 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5102 ../midori/midori-websettings.c:219 +msgid "Korean (EUC-KR)" +msgstr "Korejské (EUC-KR)" + +#: ../midori/midori-browser.c:5105 ../midori/midori-websettings.c:220 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:4362 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5108 ../midori/midori-websettings.c:221 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5111 ../midori/midori-websettings.c:222 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 -#: ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 -msgid "Custom..." -msgstr "Vlastní..." - -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5663 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5670 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5672 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5696 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:5698 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:5719 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:5734 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:5736 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:4894 -#: ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:5751 ../midori/sokoke.c:1104 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5753 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5768 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5781 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5783 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5797 msgid "_Menu" -msgstr "_Menu" +msgstr "_Nabídka" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5799 msgid "Menu" -msgstr "Menu" +msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:6004 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:6035 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:6040 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:6045 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:6054 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:6066 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" +#: ../midori/midori-browser.c:6112 ../panels/midori-transfers.c:143 +msgid "Clear All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:6470 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:974 #, c-format msgid "Search with %s" msgstr "Hledat %s" -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 msgid "Detach chosen panel from the window" msgstr "Oddělit vybraný panel od okna" -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 +#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 msgid "Align sidepanel to the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the left" msgstr "Umístit boční panel vlevo" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:722 msgid "Show panel _titles" msgstr "Zobrazit _titulky nástrojů" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:729 msgid "Show operating _controls" msgstr "_Zobrazit seznam nástrojů" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:834 msgid "Options" msgstr "Volby" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" -msgstr "Zobrazit prázdnou stránku" +msgstr "zobrazit prázdnou stránku" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" -msgstr "Zobrazit domovskou stránku" +msgstr "zobrazit domovskou stránku" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" -msgstr "Zobrazit naposledy otevřené karty" +msgstr "zobrazit naposledy otevřené karty" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:218 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "New tab" -msgstr "Nová karta" +msgstr "nové kartě" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "New window" -msgstr "Nové okno" +msgstr "novém okně" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Current tab" -msgstr "Aktuální karta" +msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Default" -msgstr "Výchozí" +msgstr "výchozí" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "Icons" -msgstr "Ikony" +msgstr "ikony" + +#: ../midori/midori-websettings.c:257 +msgid "Small icons" +msgstr "malé ikony" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:258 msgid "Text" -msgstr "Text" +msgstr "text" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:259 msgid "Icons and text" -msgstr "Ikony a text" +msgstr "ikony a text" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:260 msgid "Text beside icons" -msgstr "Text pod ikonami" +msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:275 msgid "All cookies" -msgstr "Všechna cookies" +msgstr "všechna cookies" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:276 msgid "Session cookies" -msgstr "Cookies sezení" +msgstr "cookies sezení" -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:277 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:648 msgid "None" -msgstr "Žádná" +msgstr "žádná" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:294 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:295 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:296 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:349 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:350 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:358 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:359 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:367 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:368 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:393 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:394 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:403 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:404 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:412 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:413 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:422 msgid "Show Menubar" -msgstr "Zobrazit menu" +msgstr "Zobrazit nabídku" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the menubar" -msgstr "Zobrazit menu?" +msgstr "Zobrazit nabídku?" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:431 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:440 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:449 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:465 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:474 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:484 msgid "Toolbar Style:" msgstr "Styl lišty:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:485 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:501 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:502 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:517 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:518 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:526 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:527 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:535 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:536 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:551 msgid "Show operating controls of the panel" msgstr "Zobrazí seznam nástrojů" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:552 msgid "Whether to show the operating controls of the panel" msgstr "Zda zobrazovat seznam nástrojů" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:567 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:568 msgid "Whether to align the sidepanel on the right" msgstr "Přesunout boční panel na opačnou stranu" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:583 +msgid "Open panels in separate windows" +msgstr "Otvírat panely v samostatných oknech" + +#: ../midori/midori-websettings.c:584 +msgid "Whether to always open panels in separate windows" +msgstr "Zda vždy otevřít panel v samostatné okno" + +#: ../midori/midori-websettings.c:593 msgid "When Midori starts:" msgstr "Když Midori nastartuje:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:594 msgid "What to do when Midori starts" msgstr "Co udělat, když je Midori spuštěno" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:603 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:604 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:619 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:620 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:636 msgid "Show speed dial in new tabs" msgstr "Zobrazit obsah rychlého přístupu v kartách" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:637 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:645 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:646 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:667 msgid "Ask for the destination folder" msgstr "Zeptat se na cílovou složku" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:668 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Zda se ptát, kam se bude ukládat" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:687 msgid "Notify when a transfer has been completed" msgstr "Upozornit na dokončení přenosu" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:688 msgid "Whether to show a notification when a transfer has been completed" msgstr "Zda zobrazit upozornění při dokončení přenosu" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:700 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:701 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:709 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:710 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:725 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:726 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:734 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:735 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:743 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:744 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:754 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:755 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:763 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:764 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:772 msgid "Open new pages in:" -msgstr "Otevírat nové stránky v:" +msgstr "Nové stránky otevírat v:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:773 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:782 msgid "Open external pages in:" -msgstr "Otevírat externí stránky v:" +msgstr "Externí stránky otevírat v:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:783 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:792 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:793 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:801 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:802 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:810 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:811 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:819 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:820 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:830 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Automaticky načítat obrázky" + +#: ../midori/midori-websettings.c:831 +msgid "Load and display images automatically" +msgstr "Automaticky načítat a zobrazovat obrázky" + +#: ../midori/midori-websettings.c:838 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Povolit skripty" + +#: ../midori/midori-websettings.c:839 +msgid "Enable embedded scripting languages" +msgstr "Povolit vložené skriptové jazyky" + +#: ../midori/midori-websettings.c:846 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Povolit pluginy z Netscape (Mozilly)" + +#: ../midori/midori-websettings.c:847 +msgid "Enable embedded Netscape plugin objects" +msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" + +#: ../midori/midori-websettings.c:862 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:863 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:878 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:879 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:894 +msgid "Kinetic scrolling" +msgstr "Kinetické rolování" + +#: ../midori/midori-websettings.c:895 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Zda naklápěním zařízení rolovat" + +#: ../midori/midori-websettings.c:903 msgid "Accept cookies" -msgstr "Přijímat cookies" +msgstr "Přijímat cookies:" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:904 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:913 msgid "Original cookies only" msgstr "Původní" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:914 msgid "Accept cookies from the original website only" msgstr "Z původní stránky" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:922 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:923 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:940 msgid "Remember last visited pages" msgstr "Pamatovat si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:941 msgid "Whether the last visited pages are saved" msgstr "Pamatovat si naposledy navštívené stránky?" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:949 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:950 msgid "The maximum number of days to save the history for" -msgstr "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" - -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Pamatovat si vložený text" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Pamatovat si text vložený do vstupních polí?" +msgstr "" +"Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:958 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:959 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:969 msgid "Proxy Server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:970 msgid "The proxy server used for HTTP connections" msgstr "Nastavení proxy serveru pro HTTP spojení" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:985 msgid "Detect proxy server automatically" msgstr "Zjistit proxy server automaticky" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:986 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zjistit nastavení proxy serveru automaticky?" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Velikost keše" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Povolená velikost keše" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1035 msgid "Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1036 msgid "The private data selected for deletion" msgstr "Osobní data byla označena ke smazání" -#: ../midori/midori-view.c:781 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Ikona '%s' nemůže být načtena." - #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:783 -#: ../midori/midori-view.c:3013 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Chyba" +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:915 ../midori/midori-view.c:3828 +#: ../midori/midori-view.c:3832 +#, c-format +msgid "Error - %s" +msgstr "Chyba - %s" -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:916 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Stránka '%s' nemůže být načtena." + +#: ../midori/midori-view.c:921 msgid "Try again" msgstr "Zkusit znovu" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 -#: ../midori/midori-view.c:3017 +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1168 ../midori/midori-view.c:1912 +#, c-format +msgid "Send a message to %s" +msgstr "Poslat %s zprávu" + +#: ../midori/midori-view.c:1739 ../midori/midori-view.c:1807 msgid "Open _Link" msgstr "Otevřít _odkaz" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1742 ../midori/midori-view.c:1809 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1746 +msgid "Open Link in _Foreground Tab" +msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" + +#: ../midori/midori-view.c:1747 +msgid "Open Link in _Background Tab" +msgstr "Otevřít odkaz v nové kartě na _pozadí" + +#: ../midori/midori-view.c:1750 ../midori/midori-view.c:1816 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Stáhnout umístění" +#: ../midori/midori-view.c:1753 +msgid "_Copy Link destination" +msgstr "Z_kopírovat adresu odkazu do schránky" -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1756 ../midori/midori-view.c:1828 msgid "_Save Link destination" -msgstr "_Uložit umístění" +msgstr "_Uložit odkaz" -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1757 ../midori/midori-view.c:1822 +msgid "_Download Link destination" +msgstr "_Stáhnout odkaz" + +#: ../midori/midori-view.c:1761 ../midori/midori-view.c:1797 +#: ../midori/midori-view.c:1833 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:1773 +msgid "Open _Image in New Tab" +msgstr "Otevřít _obrázek v nové kartě" + +#: ../midori/midori-view.c:1776 +msgid "Open Image in New Wi_ndow" +msgstr "Otevřít _obrázek v novém okně" + +#: ../midori/midori-view.c:1779 +msgid "Copy Image _Address" +msgstr "Zkopírovat _adresu obrázku" + +#: ../midori/midori-view.c:1782 +msgid "Save I_mage" +msgstr "Uložit o_brázek" + +#: ../midori/midori-view.c:1783 +msgid "Download I_mage" +msgstr "Stáhnout o_brázek" + +#: ../midori/midori-view.c:1790 +msgid "Copy Video _Address" +msgstr "Zkopírovat _adresu videa" + +#: ../midori/midori-view.c:1793 +msgid "Save _Video" +msgstr "Uložit _video" + +#: ../midori/midori-view.c:1793 +msgid "Download _Video" +msgstr "Stáhnout _video" + +#: ../midori/midori-view.c:1853 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1888 ../midori/midori-view.c:1899 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:1316 +#: ../midori/midori-view.c:1920 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:1494 +#: ../midori/midori-view.c:2187 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-view.c:2210 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-view.c:2213 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-view.c:2217 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:2733 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2951 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2952 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2953 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2954 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2955 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2985 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:3002 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:2323 +#: ../midori/midori-view.c:3129 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:2551 -#: ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Nová _karta" - -#: ../midori/midori-view.c:2565 +#: ../midori/midori-view.c:3372 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3377 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3377 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Nastavení pro %s" +#: ../midori/midori-view.c:3934 +msgid "Print background images" +msgstr "Tisknout obrázky na pozadí" + +#: ../midori/midori-view.c:3935 +msgid "Whether background images should be printed" +msgstr "Mají být obrázky na pozadí tištěny?" + +#: ../midori/midori-view.c:3979 ../midori/midori-preferences.c:398 +msgid "Features" +msgstr "Rozšíření" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:318 msgid "General" msgstr "Obecné" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:319 msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:334 ../midori/midori-preferences.c:341 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" -#: ../midori/midori-preferences.c:425 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:351 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Přenosy" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:366 msgid "Appearance" msgstr "Vzhled" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:367 msgid "Font settings" msgstr "Nastavení písma" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" msgstr "Výchozí font" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:372 msgid "The default font family used to display text" msgstr "Výchozí font pro zobrazení textu" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" msgstr "Velikost textu" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:377 msgid "Fixed-width Font Family" msgstr "Výchozí font písma se stejnou šířkou" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:380 msgid "The font family used to display fixed-width text" msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:383 msgid "The font size used to display fixed-width text" msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:385 msgid "Minimum Font Size" msgstr "Minimální velikost textu" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:388 msgid "The minimum font size used to display text" msgstr "Minimální velikost textu, která se použije pro zobrazení" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Kódování" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Kódování, které se použije jako výchozí" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:397 msgid "Behavior" msgstr "Chování" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Rozšíření" - -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Automaticky načítat obrázky" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Automaticky načítat a zobrazovat obrázky" - -#: ../midori/midori-preferences.c:491 -msgid "Shrink images automatically" -msgstr "Obrázky automaticky zmenšovat" - -#: ../midori/midori-preferences.c:492 -msgid "Automatically shrink standalone images to fit" -msgstr "Automaticky zmenšovat obrázky, aby se vešly" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Tisknout obrázky na pozadí" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Mají být obrázky na pozadí tištěny?" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Roztažitelné oblasti pro text" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Mohou se pole pro vstup textu roztahovat dle potřeby?" - -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Povolit skripty" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Povolit vložené skriptové jazyky" - -#: ../midori/midori-preferences.c:507 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Povolit pluginy z Netscape (Mozilly)" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" msgstr "Vnutit rozlišení 96 bodů/palec" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" msgstr "Vnutit rozlišení obrazu 96 bodů na palec" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" msgstr "Povolit vývojářské nástroje" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" msgstr "Povolit speciální rozšíření pro vývojáře" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" msgstr "Kontrola pravopisu" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" msgstr "Povolit kontrolu pravopisu" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" msgstr "Povolit kontrolu pravopisu při psaní" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. \"cs_CZ,en_GB\"" +#: ../midori/midori-preferences.c:441 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. " +"\"cs_CZ,en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:449 msgid "Interface" msgstr "Rozhraní" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" msgstr "Navigační lišta" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:460 msgid "Browsing" msgstr "Prohlížení" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "Aplikace" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "Externí aplikace" #. Page "Network" -#: ../midori/midori-preferences.c:621 -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:519 msgid "Privacy" msgstr "Soukromí" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:520 msgid "Web Cookies" msgstr "Web cookies" -#: ../midori/midori-preferences.c:668 -#: ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:531 ../midori/midori-preferences.c:538 msgid "days" msgstr "dny" -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:335 -msgid "Empty" -msgstr "Prázdné" - -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Add search engine" msgstr "Přidat vyhledávací nástroj" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Edit search engine" msgstr "Upravit vyhledávací nástroj" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:951 msgid "_Name:" msgstr "_Název:" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:995 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1009 msgid "_Token:" msgstr "_Zkratka:" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1232 msgid "Manage Search Engines" msgstr "Upravit vyhledávací nástroje" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1333 msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 -msgid "Could not run external program." -msgstr "Nemohu spustit externí program." - -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:1103 msgid "_Bookmark" msgstr "_Záložky" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:1105 msgid "Add Boo_kmark" msgstr "_Přidat záložku" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:1106 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:1107 msgid "_Extensions" msgstr "_Rozšíření" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:1108 msgid "_History" msgstr "_Historie" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:1109 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:1110 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "Uživatelské _styly" +#: ../midori/sokoke.c:1111 +msgid "New _Tab" +msgstr "Nová _karta" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:1112 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:1113 msgid "Netscape p_lugins" msgstr "Netscape p_luginy" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Uživatelské skripty" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Uživatelské styly" -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "" +"Okopírujte uživatelské skripty do složky %s a uživatelské styly do složky %s." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Nemohu sledovat složku '%s': %s" + +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:251 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:259 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:279 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:609 msgid "Separator" msgstr "Oddělovač" @@ -1869,11 +1972,20 @@ msgstr "Smazat vybranou položku historie" msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "Chyba v nastavení času" + +#: ../panels/midori-history.c:599 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času." + +#: ../panels/midori-history.c:611 msgid "A week ago" msgstr "Před týdnem" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -1881,50 +1993,48 @@ msgstr[0] "Před %d dny" msgstr[1] "Před %d dny" msgstr[2] "Před %d dny" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:624 msgid "Today" msgstr "Dnes" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:626 msgid "Yesterday" msgstr "Včera" -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:108 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape pluginy" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" msgstr "Otevřít cílovou _složku" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" msgstr "Kopírovat umís_tění" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "Vyžadována autentikace" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" msgstr "Pro otevření je vyžadováno jméno a heslo:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Jméno" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Heslo" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "Zapamatovat si _heslo" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1939,46 +2049,55 @@ msgstr "Uložená ikona '%s' nemůže být načtena" msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:483 ../katze/katze-utils.c:874 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:529 ../katze/katze-utils.c:558 msgid "Choose file" msgstr "Vybrat soubor" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:544 msgid "Choose folder" msgstr "Vybrat adresář" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Nastavení pro %s" + +#: ../extensions/adblock.c:377 msgid "Configure Advertisement filters" msgstr "Nastavení filtrů blokování reklamy" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:409 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Vložte adresu předem připravených filtrů do textového pole a kliknutím na " +"\"Přidat\" ji přidáte do seznamu. Více připravených filtrů naleznete na " +"adrese %s." + +#: ../extensions/adblock.c:549 msgid "Configure _Advertisement filters..." msgstr "_Blokování reklamy" -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:1103 msgid "Advertisement blocker" msgstr "Blokování reklamy" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:1104 msgid "Block advertisements according to a filter list" msgstr "Blokuje reklamu podle filtrů" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Obarvit karty" - -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" msgstr "Obarvené karty" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" msgstr "Obarvit každou kartu zvlášť" @@ -1987,9 +2106,17 @@ msgstr "Obarvit každou kartu zvlášť" msgid "Cookie Manager" msgstr "Správce cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Smazat vše" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen ta cookies, která odpovídají." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen " +"ta cookies, která odpovídají." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" @@ -2057,8 +2184,12 @@ msgid "Filter:" msgstr "Filtr:" #: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle názvu nebo domény" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle " +"názvu nebo domény" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2068,11 +2199,19 @@ msgstr "Správce _cookies" msgid "List, view and delete cookies" msgstr "Seznam, detaily a mazání cookies" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Přednačítání DNS záznamů" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Zjistit IP adresu odkazů" + +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech." @@ -2083,33 +2222,33 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Poslední aktualizace: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Přidat nový kanál" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Smazat kanál" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Kanály" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Chyba při hledání kořenového elementu v XML datech." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Nepodporovaný formát kanálu." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Nepodařilo se načíst XML kanál: %s" @@ -2130,59 +2269,84 @@ msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Chyba" + +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" msgstr "Kanál '%s' byl již přidán" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" msgstr "Chyba při načítání kanálu '%s'" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Nový kanál" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "Panel kanálů" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Nepodařilo se přidat položku formuláře: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "Ukládat historii hodnot vložených do formuláře" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "Není k dispozici: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "Nejsou nainstalovány soubory se zdrojem" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "Ukládání hodnot ve formuláři" + +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" msgstr "Gesta myší" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" msgstr "Ovládat Midori pomocí myši" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "Uživatelská stránka" +msgstr "Uchovávání stránek" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "_Uživatelská stránka" +msgstr "_Uchovávání stránek" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Uchovává jednu nebo více otevřených stránek stránek v kartách" -#: ../extensions/shortcuts.c:172 +#: ../extensions/shortcuts.c:162 msgid "Customize Keyboard shortcuts" msgstr "Nastavení klávesových zkratek" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:268 msgid "Customize Sh_ortcuts..." msgstr "Nastavení klávesových _zkratek..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:307 msgid "Shortcuts" msgstr "Zkratky" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:308 msgid "View and edit keyboard shortcuts" msgstr "Zobrazí a umožní změnu klávesových zkratek" @@ -2202,26 +2366,37 @@ msgstr "Rozšíření stavové lišty" msgid "Easily toggle features on web pages on and off" msgstr "Jednoduše zapíná a vypíná rozšíření webových stránek" -#: ../extensions/tab-panel.c:383 -#: ../extensions/tab-panel.c:443 +#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 msgid "Tab Panel" msgstr "Panel karet" -#: ../extensions/tab-panel.c:427 +#: ../extensions/tab-panel.c:606 msgid "T_ab Panel" msgstr "Panel _karet" -#: ../extensions/tab-panel.c:444 +#: ../extensions/tab-panel.c:623 msgid "Show tabs in a vertical panel" msgstr "Zobrazí karty ve vertikálním panelu" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "Karta historie" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" +"Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Upravit lištu" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Vybrané položky se zobrazí na liště. Změnu pořadí provedete přetažením." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"Vybrané položky se zobrazí na liště. Změnu pořadí provedete přetažením." #: ../extensions/toolbar-editor.c:423 msgid "Available Items" @@ -2235,50 +2410,108 @@ msgstr "Zobrazené položky" msgid "Customize _Toolbar..." msgstr "Upravit _lištu..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "Editor lišty" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" msgstr "Umožňuje jednoduše změnit lištu" +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "Není k dispozici" + +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "Kešuje (ukládá) HTTP komunikaci na disk" + +#~ msgid "Shrink images automatically" +#~ msgstr "Obrázky automaticky zmenšovat" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "Automaticky zmenšovat obrázky, aby se vešly" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "Obarvit karty" + +#~ msgid "Remember last form inputs" +#~ msgstr "Pamatovat si vložený text" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Pamatovat si text vložený do vstupních polí?" + +#~ msgid "Cache size" +#~ msgstr "Velikost keše" + +#~ msgid "The allowed size of the cache" +#~ msgstr "Povolená velikost keše" + +#~ msgid "The character encoding to use by default" +#~ msgstr "Kódování, které se použije jako výchozí" + +#~ msgid "MB" +#~ msgstr "MB" + +#~ msgid "Encoding" +#~ msgstr "Kódování" + +#~ msgid "User_styles" +#~ msgstr "Uživatelské _styly" + +#~ msgid "Resizable text areas" +#~ msgstr "Roztažitelné oblasti pro text" + +#~ msgid "Whether text areas are resizable" +#~ msgstr "Mohou se pole pro vstup textu roztahovat dle potřeby?" + #~ msgid "_Closed Tabs and Windows" #~ msgstr "Za_vřené karty a okna" + #~ msgid "Last open pages" #~ msgstr "Naposledy otevřené stránky" + #~ msgid "Both" #~ msgstr "Obojí" + #~ msgid "Both horizontal" #~ msgstr "Obojí vedle sebe" + #~ msgid "Load on Startup" #~ msgstr "Načíst při startu" -#~ msgid "Download Folder" -#~ msgstr "Složka pro ukládání" + #~ msgid "Configure _Toolbar..." #~ msgstr "Upravit _lištu..." + #~ msgid "_Quick Find" #~ msgstr "_Rychlé hledání" + #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Okamžitě přeskočit na slovo nebo frázi" -#~ msgid "Whether to detach the chosen panel from the window" -#~ msgstr "Z panelu vytvořit samostatné okno" + #~ msgid "Search" #~ msgstr "Najít" + #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!" + #~ msgid "_Enable" #~ msgstr "_Povolit" + #~ msgid "Enable" #~ msgstr "Povolit" + #~ msgid "_Disable" #~ msgstr "_Zakázat" + #~ msgid "Disable" #~ msgstr "Zakázat" + #~ msgid "%d days ago" #~ msgstr "Před %d dny" + #~ msgid "P_lugins" #~ msgstr "P_luginy" + #~ msgid "Plugins" #~ msgstr "Pluginy" - diff --git a/po/da.po b/po/da.po index 6a12ecb6..7ba0668a 100644 --- a/po/da.po +++ b/po/da.po @@ -4,16 +4,16 @@ # Per Kongstad , 2009. msgid "" msgstr "" -"Project-Id-Version: midori 0.1.9\n" +"Project-Id-Version: midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 23:58+0200\n" -"PO-Revision-Date: 2009-08-24 11:26+0100\n" +"POT-Creation-Date: 2009-11-13 19:23+0100\n" +"PO-Revision-Date: 2009-12-12 13:19+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Danish\n" "X-Poedit-Country: Denmark\n" @@ -22,11 +22,11 @@ msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1343 -#: ../midori/main.c:1517 -#: ../midori/main.c:1525 -#: ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +#: ../midori/main.c:1492 +#: ../midori/main.c:1685 +#: ../midori/main.c:1693 +#: ../midori/main.c:1704 +#: ../midori/midori-websettings.c:289 msgid "Midori" msgstr "Midori" @@ -34,363 +34,385 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:164 +#: ../midori/main.c:245 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:350 +#: ../midori/main.c:369 +#: ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" -#: ../midori/main.c:382 +#: ../midori/main.c:401 +#: ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:455 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:479 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke rydde historikken: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:502 +#: ../midori/main.c:536 +#: ../midori/main.c:552 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:731 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:760 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:798 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" -#: ../midori/main.c:798 -#: ../midori/main.c:826 -#: ../midori/main.c:855 +#: ../midori/main.c:817 +#: ../midori/main.c:845 +#: ../midori/main.c:874 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 -#: ../midori/main.c:901 +#: ../midori/main.c:897 +#: ../midori/main.c:920 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:989 +#: ../midori/main.c:1161 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:1101 +#: ../midori/main.c:1199 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:1116 +#: ../midori/main.c:1214 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:1120 +#: ../midori/main.c:1218 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:1125 +#: ../midori/main.c:1223 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1343 +#: ../midori/main.c:1392 +#: ../midori/main.c:1902 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sessionen kunne ikke indlæses: %s\n" + +#: ../midori/main.c:1492 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1366 +#: ../midori/main.c:1515 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1398 +#: ../midori/main.c:1547 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1609 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1447 +#: ../midori/main.c:1609 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1449 +#: ../midori/main.c:1612 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1449 +#: ../midori/main.c:1612 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1451 +#: ../midori/main.c:1615 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1618 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1457 +#: ../midori/main.c:1621 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1459 +#: ../midori/main.c:1623 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1461 +#: ../midori/main.c:1625 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1514 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1539 +#: ../midori/main.c:1707 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1619 +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1655 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1869 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1887 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1742 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sessionen kunne ikke indlæses: %s\n" - -#: ../midori/main.c:1755 +#: ../midori/main.c:1915 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:1928 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:1940 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1956 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:251 msgid "File not found." msgstr "Fil blev ikke fundet." -#: ../midori/midori-array.c:258 -#: ../midori/midori-array.c:267 +#: ../midori/midori-array.c:260 +#: ../midori/midori-array.c:270 msgid "Malformed document." msgstr "Misdannet dokument." -#: ../midori/midori-array.c:429 -#: ../midori/sokoke.c:694 +#: ../midori/midori-array.c:437 +#: ../midori/sokoke.c:771 #, c-format msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4702 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:4699 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:466 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:665 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:665 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:667 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:667 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:697 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:661 +#: ../midori/midori-browser.c:710 #: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:680 +#: ../midori/midori-browser.c:729 #: ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:752 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:704 -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:757 +#: ../midori/midori-browser.c:798 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:876 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1172 +#: ../midori/midori-browser.c:1248 +#: ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "%s af %s" + +#: ../midori/midori-browser.c:1284 #, c-format msgid "The file '%s' has been downloaded." msgstr "Filen '%s' er blevet hentet." -#: ../midori/midori-browser.c:1176 +#: ../midori/midori-browser.c:1288 msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1429 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:2136 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:3430 +#: ../midori/midori-browser.c:2228 +#: ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nyt feed" + +#: ../midori/midori-browser.c:2251 +#: ../midori/midori-browser.c:4743 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Tilføj et nyt bogmærke" + +#: ../midori/midori-browser.c:3847 #: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../panels/midori-history.c:824 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:3437 +#: ../midori/midori-browser.c:3854 #: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../panels/midori-history.c:830 +#: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3857 #: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../panels/midori-history.c:832 +#: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4164 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:3754 +#: ../midori/midori-browser.c:4168 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4181 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:3777 -#: ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:4191 +#: ../midori/midori-preferences.c:527 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4196 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3787 +#: ../midori/midori-browser.c:4201 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:3792 +#: ../midori/midori-browser.c:4206 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:3797 -#: ../midori/sokoke.c:868 +#: ../midori/midori-browser.c:4211 +#: ../midori/sokoke.c:944 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4219 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4315 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4331 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -398,1347 +420,1406 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4613 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:4165 -#: ../midori/sokoke.c:869 +#: ../midori/midori-browser.c:4615 +#: ../midori/sokoke.c:945 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4616 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:4169 +#: ../midori/midori-browser.c:4619 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:4622 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4625 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4627 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:4178 +#: ../midori/midori-browser.c:4628 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:4630 +msgid "Add Shortcut to the _desktop" +msgstr "Tilføj genvej til _skrivebordet" + +#: ../midori/midori-browser.c:4631 +msgid "Add shortcut to the desktop" +msgstr "Tilføj genvej til skrivebordet" + +#: ../midori/midori-browser.c:4633 +msgid "Subscribe to News _feed" +msgstr "Abonnér på _nyhedskilder" + +#: ../midori/midori-browser.c:4634 +msgid "Subscribe to this news feed" +msgstr "Abonnér på denne nyhedskilde" + +#: ../midori/midori-browser.c:4639 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4640 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:4642 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:4184 +#: ../midori/midori-browser.c:4643 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:4646 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:4190 +#: ../midori/midori-browser.c:4649 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4651 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:4195 +#: ../midori/midori-browser.c:4655 +msgid "Undo the last modification" +msgstr "Fortryd den sidste ændring" + +#: ../midori/midori-browser.c:4658 +msgid "Redo the last modification" +msgstr "Gentag den sidste ændring" + +#: ../midori/midori-browser.c:4662 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:4198 -#: ../midori/midori-browser.c:4201 +#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4668 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:4671 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:4207 +#: ../midori/midori-browser.c:4674 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:4210 +#: ../midori/midori-browser.c:4677 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:4680 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4682 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4683 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4685 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4686 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4690 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4692 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4693 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4705 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:4708 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4711 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4712 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4714 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4715 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4717 msgid "View Selection Source" msgstr "Vis kilde for markerede" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4718 msgid "View the source code of the selection" msgstr "Vis kildekode for markering" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4722 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4724 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:4260 +#: ../midori/midori-browser.c:4727 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:4730 msgid "Go forward to the next page" msgstr "Gå til næste side" -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:4733 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4735 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:4269 +#: ../midori/midori-browser.c:4736 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:4738 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4739 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:4276 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Tilføj et nyt bogmærke" - -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4745 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4746 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4748 #: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4749 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4752 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4753 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4757 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4758 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4760 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4761 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4763 +msgid "Focus _Current Tab" +msgstr "Fokus på _nuværende faneblad" + +#: ../midori/midori-browser.c:4764 +msgid "Focus the current tab" +msgstr "Fokus på det nuværende faneblad" + +#: ../midori/midori-browser.c:4766 +msgid "Open last _session" +msgstr "Åbn den sidste _session" + +#: ../midori/midori-browser.c:4767 +msgid "Open the tabs saved in the last session" +msgstr "Åbn faneblade gemt i den sidste session" + +#: ../midori/midori-browser.c:4769 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4771 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4772 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4774 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4775 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:4777 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4778 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4781 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:4315 +#: ../midori/midori-browser.c:4788 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4789 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4794 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:4795 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:4798 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:4799 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4802 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4803 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4806 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4807 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:4810 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:4338 +#: ../midori/midori-browser.c:4811 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:4814 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4815 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:4822 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:4352 -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4825 +#: ../midori/midori-websettings.c:215 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:4829 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:4359 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4832 +#: ../midori/midori-websettings.c:217 +msgid "Korean (EUC-KR)" +msgstr "Koreansk (EUC-KR)" + +#: ../midori/midori-browser.c:4835 +#: ../midori/midori-websettings.c:218 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:4362 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:4838 +#: ../midori/midori-websettings.c:219 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:4841 +#: ../midori/midori-websettings.c:220 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 -#: ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:4844 +#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:294 +#: ../katze/katze-utils.c:571 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:5331 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:5338 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:5340 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5364 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:5366 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:5387 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:5402 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:5404 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:4894 -#: ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:5419 +#: ../midori/sokoke.c:934 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5421 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:5436 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:5448 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5450 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:5464 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5466 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:5657 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:5688 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5693 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:5698 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5707 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:5719 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Slet alle" +#: ../midori/midori-browser.c:5763 +#: ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "Ryd alle" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:6118 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:979 #, c-format msgid "Search with %s" msgstr "Søg med %s" -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:415 +#: ../midori/midori-panel.c:417 msgid "Detach chosen panel from the window" msgstr "Frigør valgte panel fra vinduet" -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:427 +#: ../midori/midori-panel.c:429 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:439 +#: ../midori/midori-panel.c:440 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:697 msgid "Show panel _titles" msgstr "Vis panel_titler" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:704 msgid "Show operating _controls" msgstr "Vis handlings_kontroller" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:793 msgid "Options" msgstr "Indstillinger" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:198 msgid "Show Blank page" msgstr "Vis blank side" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "Vis hjemmeside" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Show last open tabs" msgstr "Vis sidste åbne faneblade" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:216 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:274 +#: ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:551 +#: ../extensions/shortcuts.c:94 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:292 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:346 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:347 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:355 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:356 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:364 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:365 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:390 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:391 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:400 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:401 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:409 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:410 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:419 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:420 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:428 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:429 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:437 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:438 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:446 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:447 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:462 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:471 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:481 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:482 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:498 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:499 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:514 msgid "Search engines in location completion" msgstr "Vis søgemaskiner i adresseudfyldelse" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:515 msgid "Whether to show search engines in the location completion" msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:523 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:524 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:532 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:533 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:548 msgid "Show operating controls of the panel" msgstr "Vis handlingskontroller til panelet" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:549 msgid "Whether to show the operating controls of the panel" msgstr "Om handlingskontroller til panelet skal vises" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:564 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:565 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:574 msgid "When Midori starts:" msgstr "Når Midori starter:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:575 msgid "What to do when Midori starts" msgstr "Hvad der skal ske når Midori startes" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:584 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:585 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:600 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:601 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:617 msgid "Show speed dial in new tabs" msgstr "Vis hurtigopkald i nye faneblade" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:618 msgid "Show speed dial in newly opened tabs" msgstr "Vis hurtigopkald i nyligt åbnede faneblade" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:626 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:627 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:648 msgid "Ask for the destination folder" msgstr "Spørg om målmappen" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:649 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Om der skal spørges om målmappen ved hentning af fil" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:668 msgid "Notify when a transfer has been completed" msgstr "Påmindelse når en overførsel er gennemført" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:669 msgid "Whether to show a notification when a transfer has been completed" msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:681 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:682 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:690 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:691 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:706 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:707 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:719 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:720 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:728 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:729 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:739 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:740 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:748 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:749 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:757 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:758 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:771 msgid "Open external pages in:" msgstr "Åbn eksterne sider i:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:772 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:785 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:786 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:794 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:795 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:803 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:804 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:812 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:813 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:823 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Indlæs billeder automatisk" + +#: ../midori/midori-websettings.c:824 +msgid "Load and display images automatically" +msgstr "Indlæs og vis billeder automatisk" + +#: ../midori/midori-websettings.c:831 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Brug skripter" + +#: ../midori/midori-websettings.c:832 +msgid "Enable embedded scripting languages" +msgstr "Slå indlejret skriptsprog til" + +#: ../midori/midori-websettings.c:839 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Slå Netscape-udvidelsesmoduler til" + +#: ../midori/midori-websettings.c:840 +msgid "Enable embedded Netscape plugin objects" +msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" + +#: ../midori/midori-websettings.c:855 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:856 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:871 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:872 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:887 +msgid "Kinetic scrolling" +msgstr "Bevægelsesrulning" + +#: ../midori/midori-websettings.c:888 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Om rulning skal ske med bevægelseshastighed eller ej" + +#: ../midori/midori-websettings.c:896 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:897 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:906 msgid "Original cookies only" msgstr "Kun for originale cookies" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:907 msgid "Accept cookies from the original website only" msgstr "Tillad kun cookies fra original websted" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:915 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:916 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:926 msgid "Remember last visited pages" msgstr "Husk sidste besøgte sider" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:927 msgid "Whether the last visited pages are saved" msgstr "Om sidste besøgte sider skal gemmes" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:935 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:936 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Husk sidste formularindtastninger" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Om sidste formularindtastninger skal gemmes" - -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:944 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:945 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:955 msgid "Proxy Server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:956 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:971 msgid "Detect proxy server automatically" msgstr "Genkend automatisk proxyserver" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:972 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Om proxyserveren genkendes automatisk fra miljøet" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:988 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:989 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1005 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1006 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Størrelse af mellemlager" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Den tilladte størrelse af mellemlager" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1021 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1022 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" -#: ../midori/midori-view.c:781 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:3773 +#: ../midori/midori-view.c:3777 +#, c-format +msgid "Error - %s" +msgstr "Fejl - %s" + +#: ../midori/midori-view.c:912 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, -#. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:783 -#: ../midori/midori-view.c:3013 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Fejl" - -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:917 msgid "Try again" msgstr "Prøv igen" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 -#: ../midori/midori-view.c:3017 +#: ../midori/midori-view.c:950 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1164 +#: ../midori/midori-view.c:1878 +#, c-format +msgid "Send a message to %s" +msgstr "Send en besked til %s" + +#: ../midori/midori-view.c:1717 +#: ../midori/midori-view.c:1780 msgid "Open _Link" msgstr "Åbn _henvisning" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1720 +#: ../midori/midori-view.c:1782 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1723 +#: ../midori/midori-view.c:1789 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Hent henvisningsadressen" +#: ../midori/midori-view.c:1726 +msgid "_Copy Link destination" +msgstr "_Kopiér henvisningsdestination" -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1729 +#: ../midori/midori-view.c:1801 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1730 +#: ../midori/midori-view.c:1795 +msgid "_Download Link destination" +msgstr "_Hent henvisningsadressen" + +#: ../midori/midori-view.c:1734 +#: ../midori/midori-view.c:1770 +#: ../midori/midori-view.c:1806 msgid "Download with Download _Manager" msgstr "Hent med nedhentnings_håndtering" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:1746 +msgid "Open _Image in New Tab" +msgstr "Åbn _billede i nyt faneblad" + +#: ../midori/midori-view.c:1749 +msgid "Open Image in New Wi_ndow" +msgstr "Åbn billede i nyt _vindue" + +#: ../midori/midori-view.c:1752 +msgid "Copy Image _Address" +msgstr "Kopiér billed_adresse" + +#: ../midori/midori-view.c:1755 +msgid "Save I_mage" +msgstr "Gem _billede" + +#: ../midori/midori-view.c:1756 +msgid "Download I_mage" +msgstr "Hent bi_llede" + +#: ../midori/midori-view.c:1763 +msgid "Copy Video _Address" +msgstr "Kopiér vide_oadresse" + +#: ../midori/midori-view.c:1766 +msgid "Save _Video" +msgstr "Gem _video" + +#: ../midori/midori-view.c:1766 +msgid "Download _Video" +msgstr "Hent _video" + +#: ../midori/midori-view.c:1826 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1854 +#: ../midori/midori-view.c:1865 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:1316 +#: ../midori/midori-view.c:1886 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:1494 +#: ../midori/midori-view.c:2145 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-view.c:2162 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-view.c:2165 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-view.c:2169 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:2685 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2896 msgid "Speed dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2897 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2898 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2899 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2900 msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2930 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:2947 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:2323 +#: ../midori/midori-view.c:3072 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:2551 -#: ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Nyt _faneblad" - -#: ../midori/midori-view.c:2565 +#: ../midori/midori-view.c:3315 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3320 msgid "_Restore Tab" msgstr "_Gendan faneblad" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:3320 msgid "_Minimize Tab" msgstr "_Minimér faneblad" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Indstillinger for %s" +#: ../midori/midori-view.c:3879 +msgid "Print background images" +msgstr "Udskriv baggrundsbilleder" + +#: ../midori/midori-view.c:3880 +msgid "Whether background images should be printed" +msgstr "Om baggrundsbilleder skal udskrives" + +#: ../midori/midori-view.c:3924 +#: ../midori/midori-preferences.c:388 +msgid "Features" +msgstr "Funktionalitet" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:317 msgid "General" msgstr "Generel" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:318 msgid "Startup" msgstr "Opstart" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:332 msgid "Use current page as homepage" msgstr "Brug nuværende side som hjemmeside" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:341 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Overførsler" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:356 msgid "Appearance" msgstr "Udseende" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:357 msgid "Font settings" msgstr "Indstillinger for skrifttype" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:359 msgid "Default Font Family" msgstr "Standard for skrifttypefamilie" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:362 msgid "The default font family used to display text" msgstr "Standard skrifttype til visning af tekst" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:365 msgid "The default font size used to display text" msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:367 msgid "Fixed-width Font Family" msgstr "Fastbredde skrifttype" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:370 msgid "The font family used to display fixed-width text" msgstr "Skrifttypen til visning af fastbredde tekst" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:373 msgid "The font size used to display fixed-width text" msgstr "Skrifttypen til visning af tekst med fastbredde" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:375 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:378 msgid "The minimum font size used to display text" msgstr "Minimum størrelse af skrifttype til at vise tekst" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Tegnsæt" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Tegnsæt som bruges standard" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:387 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Funktionalitet" - -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Indlæs billeder automatisk" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Indlæs og vis billeder automatisk" - -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:400 msgid "Shrink images automatically" msgstr "Formindsk billeder automatisk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:401 msgid "Automatically shrink standalone images to fit" msgstr "Minimér enkeltstående billeder til at passe" -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Udskriv baggrundsbilleder" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Om baggrundsbilleder skal udskrives" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Justerbare tekstområder" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Om tekstområder kan ændre størrelse" - -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Brug skripter" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Slå indlejret skriptsprog til" - -#: ../midori/midori-preferences.c:507 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Slå Netscape-udvidelsesmoduler til" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:413 msgid "Enforce 96 dots per inch" msgstr "Gennemtving 96 dots per tomme" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:414 msgid "Enforce a video dot density of 96 DPI" msgstr "Gennemtving tæthed af videopunkt på 96 DPI" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:417 msgid "Enable developer tools" msgstr "Brug udvikler-værktøjer" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:418 msgid "Enable special extensions for developers" msgstr "Slå specielle udvidelser til udviklere til" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:428 msgid "Spell Checking" msgstr "Stavekontrol" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:430 msgid "Enable Spell Checking" msgstr "Slå stavekontrol til" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:431 msgid "Enable spell checking while typing" msgstr "Slå stavekontrol til mens du taster" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:435 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "En kommaadskilt liste over sprog til at blive brugt til stavekontrol eksempelvis \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:443 msgid "Interface" msgstr "Grænseflade" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:444 msgid "Navigationbar" msgstr "Navigeringsbjælke" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:454 msgid "Browsing" msgstr "Browsing" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:476 msgid "Applications" msgstr "Programmer" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:477 msgid "External applications" msgstr "Eksterne programmer" #. Page "Network" -#: ../midori/midori-preferences.c:621 -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:494 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Web-cookies" -#: ../midori/midori-preferences.c:668 -#: ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:532 msgid "days" msgstr "dage" @@ -1775,61 +1856,69 @@ msgstr "Håndtér søgemaskiner" msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:167 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:933 msgid "_Bookmark" msgstr "_Bogmærke" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:935 msgid "Add Boo_kmark" msgstr "_Tilføj bogmærke" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:936 msgid "_Console" msgstr "_Konsol" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:937 msgid "_Extensions" msgstr "_Udvidelser" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:938 msgid "_History" msgstr "Hi_storik" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:939 msgid "_Homepage" msgstr "_Hjemmeside" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:940 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "Bruger_grænseflader" +#: ../midori/sokoke.c:941 +msgid "New _Tab" +msgstr "Nyt _faneblad" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:942 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:943 msgid "Netscape p_lugins" msgstr "Netscape-u_dvidelsesmoduler" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 +#: ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Brugerskripter" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Brugerstile" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "Kopiér brugerskripter til mappen %s og kopiér brugerstile til mappen %s." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Kan ikke overvåge mappe '%s': %s" + #: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Bogmærker" @@ -1874,22 +1963,30 @@ msgstr "Slet det valgte historikelement" msgid "Clear the entire history" msgstr "Ryd hele historikken" +#: ../panels/midori-history.c:600 +msgid "Erroneous clock time" +msgstr "Fejlagtig tid" + #: ../panels/midori-history.c:601 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid." + +#: ../panels/midori-history.c:613 msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:618 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dage siden" msgstr[1] "%d dage siden" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:626 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:628 msgid "Yesterday" msgstr "I går" @@ -1898,24 +1995,19 @@ msgstr "I går" msgid "Netscape plugins" msgstr "Netscape-udvidelsesmoduler" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s af %s" - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" msgstr "Åbn mål_mappen" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" msgstr "Kopiér henvisnings_sted" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "Godkendelse påkrævet" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" @@ -1923,14 +2015,18 @@ msgstr "" "Et brugernavn samt en adgangskode er påkrævet\n" "for at åbne dette sted:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Brugernavn" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Adgangskode" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "_Husk adgangskode" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1945,34 +2041,44 @@ msgstr "Lagerikon '%s' kunne ikke indlæses" msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:393 +#: ../katze/katze-utils.c:769 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:439 +#: ../katze/katze-utils.c:468 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:454 msgid "Choose folder" msgstr "Vælg mappe" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "Indstillinger for %s" + +#: ../extensions/adblock.c:345 msgid "Configure Advertisement filters" msgstr "Indstil reklamefiltre" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:375 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Indtast adressen til en forudindstillet filterliste i tekstfeltet og tryk \"Tilføj\" for at føje det til listen. Du kan finde flere lister på %s." + +#: ../extensions/adblock.c:513 msgid "Configure _Advertisement filters..." msgstr "Indstil _reklamefiltre..." -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:922 msgid "Advertisement blocker" msgstr "Blokering af reklamer" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:923 msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" @@ -1993,6 +2099,10 @@ msgstr "Ton hvert faneblad tydeligt" msgid "Cookie Manager" msgstr "Cookiehåndtering" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Slet alle" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Slet alle viste cookies. Hvis filter er indstillet, vil kun de cookies, som passer til filteret, blive slettet." @@ -2074,11 +2184,19 @@ msgstr "_Cookiehåndtering" msgid "List, view and delete cookies" msgstr "Vis, gennemse og slet cookies" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Hent på forhånd DNS" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Hent på forhånd IP-adresser på henvisninger som musen holdes over" + +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data." @@ -2089,33 +2207,33 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Sidst opdateret: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Tilføj nyt feed" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Slet feed" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Kunne ikke finde rodelement i feed XML-data." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Ikke understøttet feed-format." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Kunne ikke fortolke XML-feed: %s" @@ -2136,33 +2254,55 @@ msgstr "Kunne ikke finde anmodede RSS \"punkt\"elementer i XML-data." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Kunne ikke finde anmodede RSS \"kanal\"-elemterne i XML-data." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Fejl" + +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" msgstr "Feed '%s' findes allerede" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" msgstr "Fejl ved indlæsning af feed '%s'" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Nyt feed" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "Feed-panel" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Kunne ikke tilføje formularværdien: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "Gem historikken af indtastede formulardata" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "Ikke tilgængelig: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "Resourcefiler er ikke installeret" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "Historikfylder til formular" + +#: ../extensions/mouse-gestures/main.c:246 msgid "Mouse Gestures" msgstr "Musebevægelser" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures/main.c:247 msgid "Control Midori by moving the mouse" msgstr "Styr Midori ved at flytte musen" @@ -2176,19 +2316,23 @@ msgstr "Sideholder" msgid "_Pageholder" msgstr "_Sideholder" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Hold en eller flere sider åbne parallelt med dine faneblade" + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "Tilpas tastaturgenveje" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "Tilpas gen_veje..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Genveje" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Vis og redigér tastaturgenveje" @@ -2208,19 +2352,27 @@ msgstr "Status funktioner" msgid "Easily toggle features on web pages on and off" msgstr "Slå nemt netsiders funktioner til/fra" -#: ../extensions/tab-panel.c:383 -#: ../extensions/tab-panel.c:443 +#: ../extensions/tab-panel.c:562 +#: ../extensions/tab-panel.c:619 msgid "Tab Panel" msgstr "Fanebladpanel" -#: ../extensions/tab-panel.c:427 +#: ../extensions/tab-panel.c:603 msgid "T_ab Panel" msgstr "Faneblad_panel" -#: ../extensions/tab-panel.c:444 +#: ../extensions/tab-panel.c:620 msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "Fanebladshistorik" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Tilpas værktøjsbjælke" @@ -2241,14 +2393,46 @@ msgstr "Viste elementer" msgid "Customize _Toolbar..." msgstr "Tilpas _værktøjsbjælke..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "Redigering af værktøjsbjælke" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" msgstr "Redigér nemt layout af værktøjsbjælken" +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "Ikke tilgængeligt på denne platform" + +#: ../extensions/web-cache.c:583 +msgid "Web Cache" +msgstr "Webcache" + +#: ../extensions/web-cache.c:584 +msgid "Cache HTTP communication on disk" +msgstr "Cache HTTP-kommunikation på disk" + +#~ msgid "Remember last form inputs" +#~ msgstr "Husk sidste formularindtastninger" +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Om sidste formularindtastninger skal gemmes" +#~ msgid "Cache size" +#~ msgstr "Størrelse af mellemlager" +#~ msgid "The allowed size of the cache" +#~ msgstr "Den tilladte størrelse af mellemlager" +#~ msgid "Encoding" +#~ msgstr "Tegnsæt" +#~ msgid "The character encoding to use by default" +#~ msgstr "Tegnsæt som bruges standard" +#~ msgid "Resizable text areas" +#~ msgstr "Justerbare tekstområder" +#~ msgid "Whether text areas are resizable" +#~ msgstr "Om tekstområder kan ændre størrelse" +#~ msgid "MB" +#~ msgstr "MB" +#~ msgid "User_styles" +#~ msgstr "Bruger_grænseflader" #~ msgid "_Quick Find" #~ msgstr "_Find hurtigt" #~ msgid "Quickly jump to a word or phrase" @@ -2263,8 +2447,6 @@ msgstr "Redigér nemt layout af værktøjsbjælken" #~ msgstr "Begge vandrette" #~ msgid "Load on Startup" #~ msgstr "Indlæs ved opstart" -#~ msgid "Download Folder" -#~ msgstr "Nedhentning-mappen" #~ msgid "Search" #~ msgstr "Søg" #~ msgid "Warning: You are using a superuser account!" diff --git a/po/de.po b/po/de.po index de347d2a..403d862f 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.10\n" +"Project-Id-Version: midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-15 21:12+0200\n" +"POT-Creation-Date: 2009-12-02 19:32+0100\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1491 ../midori/main.c:1665 -#: ../midori/main.c:1673 ../midori/main.c:1684 -#: ../midori/midori-websettings.c:289 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1489 ../midori/main.c:1685 +#: ../midori/main.c:1693 ../midori/main.c:1704 +#: ../midori/midori-websettings.c:292 msgid "Midori" msgstr "Midori" @@ -31,79 +31,80 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:102 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:157 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:164 ../midori/main.c:245 +#: ../midori/main.c:169 ../midori/main.c:250 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:369 +#: ../midori/main.c:374 ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:401 +#: ../midori/main.c:406 ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:455 +#: ../midori/main.c:460 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:479 +#: ../midori/main.c:484 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:502 ../midori/main.c:536 ../midori/main.c:552 +#: ../midori/main.c:507 ../midori/main.c:541 ../midori/main.c:557 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:731 +#: ../midori/main.c:736 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:760 +#: ../midori/main.c:765 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:798 +#: ../midori/main.c:803 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:817 ../midori/main.c:845 ../midori/main.c:874 +#: ../midori/main.c:822 ../midori/main.c:850 ../midori/main.c:879 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:897 ../midori/main.c:920 +#: ../midori/main.c:902 ../midori/main.c:925 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:988 ../midori/main.c:1160 +#: ../midori/main.c:994 ../midori/main.c:1166 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1198 +#: ../midori/main.c:1204 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -111,1309 +112,1386 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1213 +#: ../midori/main.c:1219 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1217 +#: ../midori/main.c:1223 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1222 +#: ../midori/main.c:1228 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1391 ../midori/main.c:1892 +#: ../midori/main.c:1393 ../midori/main.c:1906 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1491 +#: ../midori/main.c:1489 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1514 +#: ../midori/main.c:1512 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1546 +#: ../midori/main.c:1544 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1595 +#: ../midori/main.c:1601 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1595 +#: ../midori/main.c:1601 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1597 +#: ../midori/main.c:1604 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1597 +#: ../midori/main.c:1604 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1599 +#: ../midori/main.c:1607 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1602 +#: ../midori/main.c:1610 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1605 +#: ../midori/main.c:1613 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1607 +#: ../midori/main.c:1615 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1609 +#: ../midori/main.c:1617 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1662 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1685 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1687 +#: ../midori/main.c:1707 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1767 +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1815 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1873 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1891 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1905 +#: ../midori/main.c:1919 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1918 +#: ../midori/main.c:1932 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1930 +#: ../midori/main.c:1944 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1946 +#: ../midori/main.c:1960 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-array.c:251 +#: ../midori/midori-array.c:350 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/midori-array.c:260 ../midori/midori-array.c:270 +#: ../midori/midori-array.c:384 ../midori/midori-array.c:407 +#: ../midori/midori-array.c:417 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:437 ../midori/sokoke.c:798 +#: ../midori/midori-array.c:426 +msgid "Unrecognized bookmark format." +msgstr "Unbekanntes Lesezeichenformat." + +#: ../midori/midori-array.c:609 ../midori/sokoke.c:955 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:4656 -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4948 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:319 ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4945 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:432 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:478 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:654 +#: ../midori/midori-browser.c:679 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:654 +#: ../midori/midori-browser.c:679 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:656 +#: ../midori/midori-browser.c:681 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:656 +#: ../midori/midori-browser.c:681 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:711 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:699 ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:724 ../midori/midori-searchaction.c:967 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:718 ../midori/midori-searchaction.c:966 +#: ../midori/midori-browser.c:743 ../midori/midori-searchaction.c:981 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:741 +#: ../midori/midori-browser.c:773 ../midori/midori-browser.c:4200 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:746 ../midori/midori-browser.c:787 +#: ../midori/midori-browser.c:783 ../midori/midori-browser.c:859 +#: ../midori/midori-browser.c:4205 ../midori/midori-browser.c:4237 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:812 +msgid "Show in the tool_bar" +msgstr "In der Werkzeug_leiste anzeigen" + +#: ../midori/midori-browser.c:827 +msgid "Run as _web application" +msgstr "Als _Internetanwendung starten" + +#: ../midori/midori-browser.c:935 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1242 ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:1302 ../panels/midori-transfers.c:272 #, c-format msgid "%s of %s" msgstr "%s von %s" -#: ../midori/midori-browser.c:1279 +#: ../midori/midori-browser.c:1338 #, c-format msgid "The file '%s' has been downloaded." msgstr "Die Datei »%s« wurde heruntergeladen." -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1342 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1424 +#: ../midori/midori-browser.c:1482 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2085 +#: ../midori/midori-browser.c:2181 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2177 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2257 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:3791 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2290 ../midori/midori-browser.c:4989 +#: ../panels/midori-bookmarks.c:235 +msgid "Add a new bookmark" +msgstr "Ein neues Lesezeichen hinzufügen" + +#: ../midori/midori-browser.c:3448 ../midori/sokoke.c:275 +#: ../midori/sokoke.c:285 ../midori/sokoke.c:313 ../midori/sokoke.c:335 +#: ../midori/sokoke.c:349 +msgid "Could not run external program." +msgstr "Konnte externes Programm nicht ausführen." + +#: ../midori/midori-browser.c:3943 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:3798 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3950 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:3801 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3953 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4111 +#: ../midori/midori-browser.c:4132 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4133 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4134 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4154 +msgid "Import bookmarks..." +msgstr "Lesezeichen importieren..." + +#: ../midori/midori-browser.c:4157 ../midori/midori-browser.c:4994 +msgid "_Import bookmarks" +msgstr "Lesezeichen _importieren" + +#: ../midori/midori-browser.c:4168 +msgid "_Application:" +msgstr "_Anwendung:" + +#: ../midori/midori-browser.c:4256 +msgid "Failed to import bookmarks" +msgstr "Fehler beim Importieren der Lesezeichen" + +#: ../midori/midori-browser.c:4405 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4409 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4422 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4138 ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:4432 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:4437 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:4148 +#: ../midori/midori-browser.c:4442 msgid "'Flash' Cookies" msgstr "»Flash« Cookies" -#: ../midori/midori-browser.c:4153 +#: ../midori/midori-browser.c:4447 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:4158 ../midori/sokoke.c:971 +#: ../midori/midori-browser.c:4452 ../midori/sokoke.c:1114 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4457 ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "Zwischenspeicher" + +#: ../midori/midori-browser.c:4465 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4561 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4577 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4859 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:4575 ../midori/sokoke.c:972 +#: ../midori/midori-browser.c:4861 ../midori/sokoke.c:1115 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-browser.c:4576 +#: ../midori/midori-browser.c:4862 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:4579 +#: ../midori/midori-browser.c:4865 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:4868 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:4585 +#: ../midori/midori-browser.c:4871 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:4587 +#: ../midori/midori-browser.c:4873 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:4874 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:4590 +#: ../midori/midori-browser.c:4876 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:4591 +#: ../midori/midori-browser.c:4877 msgid "Add shortcut to the desktop" msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4879 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4880 msgid "Subscribe to this news feed" msgstr "Diese Nachrichtenquelle abonnieren" -#: ../midori/midori-browser.c:4599 +#: ../midori/midori-browser.c:4885 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:4600 +#: ../midori/midori-browser.c:4886 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:4602 +#: ../midori/midori-browser.c:4888 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:4603 +#: ../midori/midori-browser.c:4889 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:4892 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4895 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4897 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:4615 +#: ../midori/midori-browser.c:4901 msgid "Undo the last modification" msgstr "Letzte Änderung rückgängig machen" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4904 msgid "Redo the last modification" msgstr "Die letzte Ä_nderung rückgängig machen" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4908 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:4625 ../midori/midori-browser.c:4628 +#: ../midori/midori-browser.c:4911 ../midori/midori-browser.c:4914 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:4631 +#: ../midori/midori-browser.c:4917 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:4920 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4923 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:4926 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:4642 +#: ../midori/midori-browser.c:4928 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:4643 +#: ../midori/midori-browser.c:4929 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4931 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:4646 +#: ../midori/midori-browser.c:4932 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4936 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:4652 +#: ../midori/midori-browser.c:4938 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:4653 +#: ../midori/midori-browser.c:4939 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4951 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4954 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4671 +#: ../midori/midori-browser.c:4957 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:4672 +#: ../midori/midori-browser.c:4958 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:4674 +#: ../midori/midori-browser.c:4960 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:4675 +#: ../midori/midori-browser.c:4961 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:4677 +#: ../midori/midori-browser.c:4963 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:4678 +#: ../midori/midori-browser.c:4964 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4968 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4970 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:4687 +#: ../midori/midori-browser.c:4973 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4976 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:4693 +#: ../midori/midori-browser.c:4979 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:4695 +#: ../midori/midori-browser.c:4981 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4982 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:4698 +#: ../midori/midori-browser.c:4984 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4985 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:4703 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Ein neues Lesezeichen hinzufügen" - -#: ../midori/midori-browser.c:4705 +#: ../midori/midori-browser.c:4991 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:4706 +#: ../midori/midori-browser.c:4992 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:4708 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4997 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4998 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:4712 +#: ../midori/midori-browser.c:5001 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4713 +#: ../midori/midori-browser.c:5002 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:5006 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:4718 +#: ../midori/midori-browser.c:5007 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:4720 +#: ../midori/midori-browser.c:5009 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:4721 +#: ../midori/midori-browser.c:5010 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:4723 +#: ../midori/midori-browser.c:5012 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:4724 +#: ../midori/midori-browser.c:5013 msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:4726 +#: ../midori/midori-browser.c:5015 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:5016 msgid "Open the tabs saved in the last session" msgstr "In der letzten Sitzung geöffnete Reiter öffnen" -#: ../midori/midori-browser.c:4729 +#: ../midori/midori-browser.c:5018 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:5020 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:5021 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:4734 +#: ../midori/midori-browser.c:5023 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:5024 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:4737 +#: ../midori/midori-browser.c:5026 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:4738 +#: ../midori/midori-browser.c:5027 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:4741 +#: ../midori/midori-browser.c:5030 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:4748 +#: ../midori/midori-browser.c:5037 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:5038 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:5043 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:4755 +#: ../midori/midori-browser.c:5044 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:4758 +#: ../midori/midori-browser.c:5047 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:4759 +#: ../midori/midori-browser.c:5048 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:4762 +#: ../midori/midori-browser.c:5051 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:4763 +#: ../midori/midori-browser.c:5052 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:4766 +#: ../midori/midori-browser.c:5055 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:4767 +#: ../midori/midori-browser.c:5056 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:5059 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:4771 +#: ../midori/midori-browser.c:5060 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:4774 +#: ../midori/midori-browser.c:5063 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:4775 +#: ../midori/midori-browser.c:5064 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:4782 +#: ../midori/midori-browser.c:5071 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:4785 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5074 ../midori/midori-websettings.c:217 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4789 +#: ../midori/midori-browser.c:5078 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:4792 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:219 +msgid "Korean (EUC-KR)" +msgstr "Koreanisch (EUC-KR)" + +#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:220 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:4795 ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:5087 ../midori/midori-websettings.c:221 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4798 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5090 ../midori/midori-websettings.c:222 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:4801 ../midori/midori-websettings.c:221 -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-browser.c:5093 ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:5284 +#: ../midori/midori-browser.c:5643 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:5291 +#: ../midori/midori-browser.c:5650 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5652 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5676 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5678 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5699 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5714 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5716 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:5372 ../midori/sokoke.c:961 +#: ../midori/midori-browser.c:5731 ../midori/sokoke.c:1104 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5733 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5748 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5760 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5762 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5776 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5778 msgid "Menu" msgstr "Menü" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5981 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:6012 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:6017 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:6022 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:6031 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:6043 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:5697 ../panels/midori-transfers.c:143 +#: ../midori/midori-browser.c:6089 ../panels/midori-transfers.c:143 msgid "Clear All" msgstr "Alle entfernen" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6456 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-locationaction.c:961 +#: ../midori/midori-locationaction.c:974 #, c-format msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/midori-panel.c:381 ../midori/midori-panel.c:383 +#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:393 ../midori/midori-panel.c:395 -#: ../midori/midori-panel.c:576 ../midori/midori-panel.c:579 +#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 +#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:405 ../midori/midori-panel.c:406 +#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-panel.c:703 +#: ../midori/midori-panel.c:722 msgid "Show panel _titles" msgstr "Leisten_titel anzeigen" -#: ../midori/midori-panel.c:711 +#: ../midori/midori-panel.c:729 msgid "Show operating _controls" msgstr "_Bedienelemente anzeigen" -#: ../midori/midori-panel.c:782 +#: ../midori/midori-panel.c:834 msgid "Options" msgstr "Optionen" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Leere Seite anzeigen" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:218 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 +msgid "Small icons" +msgstr "Kleine Symbole" + +#: ../midori/midori-websettings.c:258 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:259 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:260 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:275 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:276 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:274 ../panels/midori-addons.c:93 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:277 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:648 ../extensions/shortcuts.c:94 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:294 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:295 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:296 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:349 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:350 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:358 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:359 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:367 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:368 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:393 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:394 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:403 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:404 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:412 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:413 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:422 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:431 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:440 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:449 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:465 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:485 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:517 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:518 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:526 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:527 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:535 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:536 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:551 msgid "Show operating controls of the panel" msgstr "Bedienelemente der Leiste anzeigen" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:552 msgid "Whether to show the operating controls of the panel" msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:567 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:568 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:583 +msgid "Open panels in separate windows" +msgstr "Leisten in eigenen Fenstern öffnen" + +#: ../midori/midori-websettings.c:584 +msgid "Whether to always open panels in separate windows" +msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" + +#: ../midori/midori-websettings.c:593 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "What to do when Midori starts" msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:603 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:604 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:619 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:620 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:636 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:637 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:645 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:646 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:667 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:668 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:687 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss der Übertragung" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:688 msgid "Whether to show a notification when a transfer has been completed" msgstr "" "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:700 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:701 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:709 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:710 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:725 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:707 +#: ../midori/midori-websettings.c:726 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:734 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:716 +#: ../midori/midori-websettings.c:735 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:743 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:744 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:754 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:763 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:772 msgid "Open new pages in:" msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:782 msgid "Open external pages in:" msgstr "Öffne Seiten von außerhalb in:" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:783 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:792 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:793 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:801 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:802 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:810 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:811 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:819 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:820 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:817 +#: ../midori/midori-websettings.c:830 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Bilder automatisch laden" + +#: ../midori/midori-websettings.c:831 +msgid "Load and display images automatically" +msgstr "Bilder automatisch laden und anzeigen" + +#: ../midori/midori-websettings.c:838 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Skripte einschalten" + +#: ../midori/midori-websettings.c:839 +msgid "Enable embedded scripting languages" +msgstr "Eingebettete Skriptsprachen einschalten" + +#: ../midori/midori-websettings.c:846 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Netscape-Module einschalten" + +#: ../midori/midori-websettings.c:847 +msgid "Enable embedded Netscape plugin objects" +msgstr "Eingebettete Netscape-Module einschalten" + +#: ../midori/midori-websettings.c:862 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:863 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:878 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:879 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:894 msgid "Kinetic scrolling" msgstr "Sanfter Bildlauf" -#: ../midori/midori-websettings.c:850 +#: ../midori/midori-websettings.c:895 msgid "Whether scrolling should kinetically move according to speed" msgstr "Ob der Bildlauf sanft schneller und langsamer wird" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:903 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:904 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:913 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:914 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:922 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:878 +#: ../midori/midori-websettings.c:923 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:940 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:941 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:949 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:950 msgid "The maximum number of days to save the history for" -msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" +msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-websettings.c:906 -msgid "Remember last form inputs" -msgstr "Zuletzt eingegebene Formulareingaben merken" - -#: ../midori/midori-websettings.c:907 -msgid "Whether the last form inputs are saved" -msgstr "Die letzten Formulareingaben speichern" - -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:958 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:959 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:969 msgid "Proxy Server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:970 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:985 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:986 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:985 -msgid "Cache size" -msgstr "Zwischenspeichergröße" - -#: ../midori/midori-websettings.c:986 -msgid "The allowed size of the cache" -msgstr "Die erlaubte Zwischenspeichergröße" - -#: ../midori/midori-websettings.c:1001 +#: ../midori/midori-websettings.c:1035 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:1036 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" @@ -1421,330 +1499,289 @@ msgstr "Zum Löschen ausgewählte private Daten" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:848 ../midori/midori-view.c:3694 -#: ../midori/midori-view.c:3698 +#: ../midori/midori-view.c:915 ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3824 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:916 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:854 +#: ../midori/midori-view.c:921 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:887 +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1101 ../midori/midori-view.c:1814 +#: ../midori/midori-view.c:1168 ../midori/midori-view.c:1904 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:1653 ../midori/midori-view.c:1716 +#: ../midori/midori-view.c:1731 ../midori/midori-view.c:1799 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:1656 ../midori/midori-view.c:1718 +#: ../midori/midori-view.c:1734 ../midori/midori-view.c:1801 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1659 ../midori/midori-view.c:1725 +#: ../midori/midori-view.c:1738 +msgid "Open Link in _Foreground Tab" +msgstr "Verweis in _Vordergrund-Reiter öffnen" + +#: ../midori/midori-view.c:1739 +msgid "Open Link in _Background Tab" +msgstr "Verweis in _Hintergrund-Reiter öffnen" + +#: ../midori/midori-view.c:1742 ../midori/midori-view.c:1808 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1662 +#: ../midori/midori-view.c:1745 msgid "_Copy Link destination" msgstr "Verweisziel _kopieren" -#: ../midori/midori-view.c:1665 ../midori/midori-view.c:1737 +#: ../midori/midori-view.c:1748 ../midori/midori-view.c:1820 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1666 ../midori/midori-view.c:1731 +#: ../midori/midori-view.c:1749 ../midori/midori-view.c:1814 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1670 ../midori/midori-view.c:1706 -#: ../midori/midori-view.c:1742 +#: ../midori/midori-view.c:1753 ../midori/midori-view.c:1789 +#: ../midori/midori-view.c:1825 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:1682 +#: ../midori/midori-view.c:1765 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:1685 +#: ../midori/midori-view.c:1768 msgid "Open Image in New Wi_ndow" msgstr "Bild in neuem Fe_nster öffnen" -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1771 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:1691 +#: ../midori/midori-view.c:1774 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:1692 +#: ../midori/midori-view.c:1775 msgid "Download I_mage" msgstr "Bi_ld herunterladen" -#: ../midori/midori-view.c:1699 +#: ../midori/midori-view.c:1782 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:1702 +#: ../midori/midori-view.c:1785 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:1702 +#: ../midori/midori-view.c:1785 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:1762 +#: ../midori/midori-view.c:1845 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:1790 ../midori/midori-view.c:1801 +#: ../midori/midori-view.c:1880 ../midori/midori-view.c:1891 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1912 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2070 +#: ../midori/midori-view.c:2179 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2087 +#: ../midori/midori-view.c:2202 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2090 +#: ../midori/midori-view.c:2205 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2094 +#: ../midori/midori-view.c:2209 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2725 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2943 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:2818 +#: ../midori/midori-view.c:2944 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:2819 +#: ../midori/midori-view.c:2945 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2820 +#: ../midori/midori-view.c:2946 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2821 +#: ../midori/midori-view.c:2947 msgid "Are you sure you want to delete this shortcut?" msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" -#: ../midori/midori-view.c:2851 +#: ../midori/midori-view.c:2977 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:2868 +#: ../midori/midori-view.c:2994 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:2993 +#: ../midori/midori-view.c:3121 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:3222 ../midori/sokoke.c:968 -msgid "New _Tab" -msgstr "Neuer _Reiter" - -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3364 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:3241 +#: ../midori/midori-view.c:3369 msgid "_Restore Tab" msgstr "Reiter _wiederherstellen" -#: ../midori/midori-view.c:3241 +#: ../midori/midori-view.c:3369 msgid "_Minimize Tab" msgstr "Reiter _minimieren" -#: ../midori/midori-view.c:3800 +#: ../midori/midori-view.c:3926 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:3801 +#: ../midori/midori-view.c:3927 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:3845 ../midori/midori-preferences.c:489 +#: ../midori/midori-view.c:3971 ../midori/midori-preferences.c:398 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Einstellungen für %s" - #. Page "General" -#: ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:318 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:319 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:334 ../midori/midori-preferences.c:341 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" -#: ../midori/midori-preferences.c:431 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:351 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Übertragungen" #. Page "Appearance" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:366 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:367 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:372 msgid "The default font family used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:377 msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:380 msgid "The font family used to display fixed-width text" msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:383 msgid "The font size used to display fixed-width text" msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:385 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:388 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:478 -msgid "Encoding" -msgstr "Zeichensatz" - -#: ../midori/midori-preferences.c:481 -msgid "The character encoding to use by default" -msgstr "Der voreingestellte Zeichensatz" - #. Page "Behavior" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:397 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Bilder automatisch laden" - -#: ../midori/midori-preferences.c:493 -msgid "Load and display images automatically" -msgstr "Bilder automatisch laden und anzeigen" - -#: ../midori/midori-preferences.c:501 -msgid "Shrink images automatically" -msgstr "Bilder automatisch verkleinern" - -#: ../midori/midori-preferences.c:502 -msgid "Automatically shrink standalone images to fit" -msgstr "Einzelne Bilder automatisch angemessen verkleinern" - -#: ../midori/midori-preferences.c:509 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Skripte einschalten" - -#: ../midori/midori-preferences.c:510 -msgid "Enable embedded scripting languages" -msgstr "Eingebettete Skriptsprachen einschalten" - -#: ../midori/midori-preferences.c:513 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Netscape-Module einschalten" - -#: ../midori/midori-preferences.c:514 -msgid "Enable embedded Netscape plugin objects" -msgstr "Eingebettete Netscape-Module einschalten" - -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" -msgstr "Erzwinge 96 Punkte pro Zoll" +msgstr "96 Punkte pro Zoll erzwingen" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" -msgstr "Erzwinge eine Punktdichte von 96 DPI" +msgstr "Eine Punktdichte von 96 DPI erzwingen" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" msgstr "Rechtschreibprüfung" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" msgstr "Rechtschreibprüfung einschalten" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" msgstr "Rechtschreibprüfung beim Eintippen einschalten" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:441 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" @@ -1753,118 +1790,114 @@ msgstr "" "Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:449 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:460 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "Anwendungen" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "Externe Anwendungen" #. Page "Network" -#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:653 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:519 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:520 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:531 ../midori/midori-preferences.c:538 msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 +#: ../midori/midori-searchaction.c:491 ../katze/katze-arrayaction.c:338 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:951 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:995 msgid "_Icon:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1009 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1228 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1329 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:166 ../midori/sokoke.c:178 -msgid "Could not run external program." -msgstr "Konnte externes Programm nicht ausführen." - -#: ../midori/sokoke.c:960 +#: ../midori/sokoke.c:1103 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:962 +#: ../midori/sokoke.c:1105 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:963 +#: ../midori/sokoke.c:1106 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:964 +#: ../midori/sokoke.c:1107 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:965 +#: ../midori/sokoke.c:1108 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:966 +#: ../midori/sokoke.c:1109 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:967 +#: ../midori/sokoke.c:1110 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:969 +#: ../midori/sokoke.c:1111 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../midori/sokoke.c:1112 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:970 +#: ../midori/sokoke.c:1113 msgid "Netscape p_lugins" msgstr "Netscape-Module" @@ -1876,35 +1909,35 @@ msgstr "Benutzerskripte" msgid "Userstyles" msgstr "Benutzerstile" -#: ../panels/midori-addons.c:287 +#: ../panels/midori-addons.c:294 #, c-format msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." msgstr "" "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den " "Ordner »%s«." -#: ../panels/midori-addons.c:889 +#: ../panels/midori-addons.c:896 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:243 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:251 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:264 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:594 msgid "Separator" msgstr "Trennlinie" @@ -1932,22 +1965,33 @@ msgstr "Ausgewählten Verlaufseintrag löschen" msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "Fehlerhafte Uhrzeit" + +#: ../panels/midori-history.c:599 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" +"Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " +"eingestellte Datum und die Uhrzeit." + +#: ../panels/midori-history.c:611 msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Vor %d Tag" msgstr[1] "Vor %d Tagen" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:624 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:626 msgid "Yesterday" msgstr "Gestern" @@ -2001,24 +2045,29 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:203 ../katze/katze-utils.c:420 +#: ../katze/katze-utils.c:483 ../katze/katze-utils.c:874 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:238 ../katze/katze-utils.c:267 +#: ../katze/katze-utils.c:529 ../katze/katze-utils.c:558 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:253 +#: ../katze/katze-utils.c:544 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/adblock.c:315 +#: ../katze/katze-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Einstellungen für %s" + +#: ../extensions/adblock.c:373 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:345 +#: ../extensions/adblock.c:405 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2028,27 +2077,23 @@ msgstr "" "ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " "Listen finden Sie auf %s." -#: ../extensions/adblock.c:483 +#: ../extensions/adblock.c:545 msgid "Configure _Advertisement filters..." msgstr "Werbefilter einstellen..." -#: ../extensions/adblock.c:844 +#: ../extensions/adblock.c:1099 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:845 +#: ../extensions/adblock.c:1100 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Reiter unterschiedlich einfärben" - -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" @@ -2176,19 +2221,19 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" @@ -2247,28 +2292,33 @@ msgstr "Nachrichtenquellenleiste" msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/formhistory.c:286 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Formularfeld konnte nicht hinzugefügt werden: %s\n" + +#: ../extensions/formhistory.c:502 msgid "Stores history of entered form data" msgstr "Speichert zuvor eingegebene Formulareingaben" -#: ../extensions/formhistory.c:290 +#: ../extensions/formhistory.c:506 #, c-format msgid "Not available: %s" msgstr "Nicht verfügbar: %s" -#: ../extensions/formhistory.c:291 +#: ../extensions/formhistory.c:507 msgid "Resource files not installed" msgstr "Konfigurationsdateien nicht installiert" -#: ../extensions/formhistory.c:296 +#: ../extensions/formhistory.c:513 msgid "Form history filler" msgstr "Formularvervollständigung" -#: ../extensions/mouse-gestures/main.c:246 +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures/main.c:247 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" @@ -2281,19 +2331,23 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Eine oder mehrere Seiten gleichzeitig mit den Reitern offen lassen." + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "Tastaturkürzel anpassen" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "Tastaturkürzel anpassen..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Tastaturkürzel" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" @@ -2313,18 +2367,26 @@ msgstr "Funktionen in der Statusleiste" msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:562 ../extensions/tab-panel.c:619 +#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:603 +#: ../extensions/tab-panel.c:606 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:620 +#: ../extensions/tab-panel.c:623 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "Verlaufsgestützte Reiterliste" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" @@ -2361,6 +2423,40 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Not available on this platform" msgstr "Auf dieser Plattform nicht verfügbar" +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" + +#~ msgid "Shrink images automatically" +#~ msgstr "Bilder automatisch verkleinern" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "Einzelne Bilder automatisch angemessen verkleinern" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "Reiter unterschiedlich einfärben" + +#~ msgid "Remember last form inputs" +#~ msgstr "Zuletzt eingegebene Formulareingaben merken" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Die letzten Formulareingaben speichern" + +#~ msgid "Cache size" +#~ msgstr "Zwischenspeichergröße" + +#~ msgid "The allowed size of the cache" +#~ msgstr "Die erlaubte Zwischenspeichergröße" + +#~ msgid "Encoding" +#~ msgstr "Zeichensatz" + +#~ msgid "The character encoding to use by default" +#~ msgstr "Der voreingestellte Zeichensatz" + +#~ msgid "MB" +#~ msgstr "MB" + #~ msgid "User_styles" #~ msgstr "Benutzer_stile" @@ -2388,9 +2484,6 @@ msgstr "Auf dieser Plattform nicht verfügbar" #~ msgid "Configure _Toolbar..." #~ msgstr "Werkzeugleiste anpassen..." -#~ msgid "Whether to detach the chosen panel from the window" -#~ msgstr "Die gewählte Seitenleiste vom Fenster ablösen" - #~ msgid "_Enable" #~ msgstr "_Einschalten" diff --git a/po/fr.po b/po/fr.po index 55cada9a..4ad07cd5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,11 +9,11 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.7\n" +"Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 01:57+0200\n" -"PO-Revision-Date: 2009-06-12 08:11+0200\n" -"Last-Translator: Jérôme Guelfucci \n" +"POT-Creation-Date: 2009-11-06 03:03-0500\n" +"PO-Revision-Date: 2009-11-06 20:21-0500\n" +"Last-Translator: Pascal Gervais \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -24,9 +24,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1344 ../midori/main.c:1498 -#: ../midori/main.c:1506 ../midori/main.c:1517 -#: ../midori/midori-websettings.c:285 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1496 ../midori/main.c:1690 +#: ../midori/main.c:1698 ../midori/main.c:1709 +#: ../midori/midori-websettings.c:286 msgid "Midori" msgstr "Midori" @@ -34,80 +34,80 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur Internet" -#: ../midori/main.c:96 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:158 ../midori/main.c:238 +#: ../midori/main.c:168 ../midori/main.c:249 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:350 +#: ../midori/main.c:373 ../extensions/formhistory.c:296 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:382 +#: ../midori/main.c:405 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:459 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer l'élément de l'historique : %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:483 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 +#: ../midori/main.c:506 ../midori/main.c:540 ../midori/main.c:556 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter l'élément à l'historique : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:735 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:764 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:802 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" -#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 +#: ../midori/main.c:821 ../midori/main.c:849 ../midori/main.c:878 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 ../midori/main.c:901 +#: ../midori/main.c:901 ../midori/main.c:924 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:993 ../midori/main.c:1165 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:1101 +#: ../midori/main.c:1203 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -116,267 +116,284 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1116 +#: ../midori/main.c:1218 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1120 +#: ../midori/main.c:1222 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1125 +#: ../midori/main.c:1227 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1344 +#: ../midori/main.c:1396 ../midori/main.c:1917 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "La session n'a pas pu être chargée : %s\n" + +#: ../midori/main.c:1496 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1367 +#: ../midori/main.c:1519 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1400 +#: ../midori/main.c:1551 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous: %s\n" -#: ../midori/main.c:1435 +#: ../midori/main.c:1613 msgid "Run ADDRESS as a web application" -msgstr "Lancer l'ADRESSE spécifiée comme une application internet" +msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1435 +#: ../midori/main.c:1613 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1437 +#: ../midori/main.c:1615 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1437 +#: ../midori/main.c:1615 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1440 +#: ../midori/main.c:1617 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1444 +#: ../midori/main.c:1620 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1447 +#: ../midori/main.c:1623 msgid "Execute the specified command" -msgstr "" +msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1449 +#: ../midori/main.c:1625 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1451 +#: ../midori/main.c:1627 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1495 +#: ../midori/main.c:1687 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1518 +#: ../midori/main.c:1710 msgid "Please report comments, suggestions and bugs to:" msgstr "" "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1520 +#: ../midori/main.c:1712 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1602 +#: ../midori/main.c:1792 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1638 +#: ../midori/main.c:1840 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1688 +#: ../midori/main.c:1884 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1700 +#: ../midori/main.c:1902 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1715 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "La session n'a pas pu être chargée : %s\n" - # pas très content -#: ../midori/main.c:1728 +#: ../midori/main.c:1930 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1741 +#: ../midori/main.c:1943 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1753 +#: ../midori/main.c:1955 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:1769 +#: ../midori/main.c:1971 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:251 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 +#: ../midori/midori-array.c:260 ../midori/midori-array.c:270 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 +#: ../midori/midori-array.c:437 ../midori/sokoke.c:774 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4725 +#: ../midori/midori-browser.c:4731 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:4728 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:410 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:435 +#: ../midori/midori-browser.c:466 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:665 msgid "New folder" -msgstr "Nouveau répertoire" +msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:665 msgid "Edit folder" -msgstr "Modifier le répertoire" +msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:667 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:667 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:649 +#: ../midori/midori-browser.c:697 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:710 ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:729 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:700 +#: ../midori/midori-browser.c:752 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:757 ../midori/midori-browser.c:798 msgid "Toplevel folder" -msgstr "Répertoire supérieur" +msgstr "Dossier supérieur" -#: ../midori/midori-browser.c:822 +#: ../midori/midori-browser.c:876 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1169 +#: ../midori/midori-browser.c:1248 ../panels/midori-transfers.c:272 #, c-format -msgid "The file %s has been downloaded." -msgstr "Le fichier %s a été téléchargé." +msgid "%s of %s" +msgstr "%s de %s" -#: ../midori/midori-browser.c:1173 +#: ../midori/midori-browser.c:1285 +msgid "The file '%s' has been downloaded." +msgstr "Le fichier « %s » a été téléchargé." + +#: ../midori/midori-browser.c:1289 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../midori/midori-browser.c:1314 +#: ../midori/midori-browser.c:1430 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:1960 +#: ../midori/midori-browser.c:2138 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2230 ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nouveau flux" + +#: ../midori/midori-browser.c:2253 ../midori/midori-browser.c:4772 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Ajouter un nouveau signet" + +#: ../midori/midori-browser.c:3860 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:824 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3867 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:3439 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3870 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:832 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3739 +#: ../midori/midori-browser.c:4180 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:4184 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:4197 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:4207 ../midori/midori-preferences.c:532 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:4212 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:3776 +#: ../midori/midori-browser.c:4217 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:4222 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 -msgid "_Closed Tabs and Windows" -msgstr "Onglets et fenêtres _fermés" +#: ../midori/midori-browser.c:4227 ../midori/sokoke.c:947 +msgid "_Closed Tabs" +msgstr "Onglets _fermés" -#: ../midori/midori-browser.c:3869 +#: ../midori/midori-browser.c:4235 +msgid "Clear private data when _quitting Midori" +msgstr "Effacer les informations privées en _quittant Midori" + +#: ../midori/midori-browser.c:4331 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4347 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -385,1397 +402,1493 @@ msgstr "" "Pascal Gervais \n" "Jérôme Geulfucci " -#: ../midori/midori-browser.c:4111 +#: ../midori/midori-browser.c:4642 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:4114 +#: ../midori/midori-browser.c:4644 ../midori/sokoke.c:948 +msgid "New _Window" +msgstr "Nouvelle _fenêtre" + +#: ../midori/midori-browser.c:4645 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4648 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4651 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:4123 +#: ../midori/midori-browser.c:4654 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:4125 +#: ../midori/midori-browser.c:4656 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:4126 +#: ../midori/midori-browser.c:4657 msgid "Add shortcut to speed dial" msgstr "Ajouter un raccourci à la page d'appel rapide" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4659 +msgid "Add Shortcut to the _desktop" +msgstr "Ajouter un raccourci sur le _bureau" + +#: ../midori/midori-browser.c:4660 +msgid "Add shortcut to the desktop" +msgstr "Ajouter un raccourci sur le bureau" + +#: ../midori/midori-browser.c:4662 +msgid "Subscribe to News _feed" +msgstr "Souscrire au flux de _nouvelles" + +#: ../midori/midori-browser.c:4663 +msgid "Subscribe to this news feed" +msgstr "Souscrire à ce flux de _nouvelles" + +#: ../midori/midori-browser.c:4668 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:4129 +#: ../midori/midori-browser.c:4669 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:4131 +#: ../midori/midori-browser.c:4671 msgid "C_lose Window" -msgstr "_Fermer la fenêtre" +msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4672 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4675 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4678 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:4680 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:4684 +msgid "Undo the last modification" +msgstr "Annuler la dernière modification" + +#: ../midori/midori-browser.c:4687 +msgid "Redo the last modification" +msgstr "Refaire la dernière modification" + +#: ../midori/midori-browser.c:4691 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 +#: ../midori/midori-browser.c:4694 ../midori/midori-browser.c:4697 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:4152 +#: ../midori/midori-browser.c:4700 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:4155 +#: ../midori/midori-browser.c:4703 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:4158 +#: ../midori/midori-browser.c:4706 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:4161 +#: ../midori/midori-browser.c:4709 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4711 msgid "Find _Next" -msgstr "Rechercher le _suivant" +msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:4164 +#: ../midori/midori-browser.c:4712 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4714 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4715 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:4171 +#: ../midori/midori-browser.c:4719 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:4173 +#: ../midori/midori-browser.c:4721 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:4174 +#: ../midori/midori-browser.c:4722 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:4186 +#: ../midori/midori-browser.c:4734 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:4737 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4740 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:4193 +#: ../midori/midori-browser.c:4741 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:4195 +#: ../midori/midori-browser.c:4743 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:4196 +#: ../midori/midori-browser.c:4744 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:4198 +#: ../midori/midori-browser.c:4746 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:4199 +#: ../midori/midori-browser.c:4747 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:4203 +#: ../midori/midori-browser.c:4751 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4753 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:4208 +#: ../midori/midori-browser.c:4756 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4759 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4762 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4764 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4765 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4767 msgid "Undo _Close Tab" -msgstr "Annuler la _fermeture de l'onglet" +msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:4220 +#: ../midori/midori-browser.c:4768 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Ajouter un nouveau signet" - -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4774 msgid "Add a new _folder" -msgstr "Ajouter un nouveau _répertoire" +msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4775 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:4228 -msgid "_Tools" -msgstr "_Outils" - -#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4777 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:4231 +#: ../midori/midori-browser.c:4778 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:4234 +#: ../midori/midori-browser.c:4781 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4782 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:4239 +#: ../midori/midori-browser.c:4786 msgid "_Previous Tab" -msgstr "Onglet _précedent" +msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4787 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:4242 +#: ../midori/midori-browser.c:4789 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:4243 +#: ../midori/midori-browser.c:4790 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4792 +msgid "Focus _Current Tab" +msgstr "_Focaliser l'onglet actuel" + +#: ../midori/midori-browser.c:4793 +msgid "Focus the current tab" +msgstr "Focaliser l'onglet actuel" + +#: ../midori/midori-browser.c:4795 +msgid "Open last _session" +msgstr "Ouvrir la _dernière session" + +#: ../midori/midori-browser.c:4796 +msgid "Open the tabs saved in the last session" +msgstr "Ouvrir les onglets enregistrés dans la dernière session" + +#: ../midori/midori-browser.c:4798 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4800 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4801 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4803 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4804 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4806 msgid "_Report a Bug" -msgstr "_Signaler une anomalie" +msgstr "Signaler une _anomalie" -#: ../midori/midori-browser.c:4254 +#: ../midori/midori-browser.c:4807 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4810 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4817 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:4265 +#: ../midori/midori-browser.c:4818 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4823 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:4824 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4827 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4828 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4831 msgid "Side_panel" -msgstr "_Panneau latéral" +msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4832 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4835 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4836 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4839 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4840 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4843 msgid "_Statusbar" -msgstr "Barre d'é_tat" +msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4844 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4851 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +#: ../midori/midori-browser.c:4854 ../midori/midori-websettings.c:212 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4858 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4861 ../midori/midori-websettings.c:214 +msgid "Korean (EUC-KR)" +msgstr "Coréen (EUC-KR)" + +#: ../midori/midori-browser.c:4864 ../midori/midori-websettings.c:215 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215 +#: ../midori/midori-browser.c:4867 ../midori/midori-websettings.c:216 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4870 ../midori/midori-websettings.c:217 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-browser.c:4873 ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:291 ../katze/katze-utils.c:554 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:4755 +#: ../midori/midori-browser.c:5357 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:4762 +#: ../midori/midori-browser.c:5364 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:4764 +#: ../midori/midori-browser.c:5366 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:4788 +#: ../midori/midori-browser.c:5390 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:5392 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:5413 msgid "Reopen a previously closed tab or window" -msgstr "Réouvrir un onglet ou une fenêtre précédemment fermé" +msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:5428 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:5430 msgid "Reopen pages that you visited earlier" -msgstr "Réouvrir des pages précédemment visitées" +msgstr "Rouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 +#: ../midori/midori-browser.c:5445 ../midori/sokoke.c:937 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:5447 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:5462 +msgid "_Tools" +msgstr "_Outils" + +#: ../midori/midori-browser.c:5474 msgid "_Window" -msgstr "_Fenêtre" +msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:5476 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:5490 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:5492 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5683 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5714 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5719 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5724 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:5733 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:5745 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:5147 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Supprimer tous" +#: ../midori/midori-browser.c:5796 ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "Effacer tout" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:6150 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:979 #, c-format msgid "Search with %s" msgstr "Rechercher avec %s" -#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:414 ../midori/midori-panel.c:416 msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi de la fenêtre" -#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +#: ../midori/midori-panel.c:426 ../midori/midori-panel.c:428 +#: ../midori/midori-panel.c:612 ../midori/midori-panel.c:615 msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 +#: ../midori/midori-panel.c:438 ../midori/midori-panel.c:439 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:509 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 -msgid "Blank page" -msgstr "Page vierge" +#: ../midori/midori-panel.c:696 +msgid "Show panel _titles" +msgstr "Afficher le _titre des panneaux" + +#: ../midori/midori-panel.c:703 +msgid "Show operating _controls" +msgstr "Afficher les élements de _contrôle" -#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 -msgid "Homepage" -msgstr "Page d'accueil" +#: ../midori/midori-panel.c:792 +msgid "Options" +msgstr "Options" + +#: ../midori/midori-websettings.c:195 +msgid "Show Blank page" +msgstr "Afficher une Page vierge" + +#: ../midori/midori-websettings.c:196 +msgid "Show Homepage" +msgstr "Afficher la page d'accueil" #: ../midori/midori-websettings.c:197 -msgid "Last open pages" -msgstr "Dernières pages ouvertes" +msgid "Show last open tabs" +msgstr "Afficher les derniers onglets ouverts" #: ../midori/midori-websettings.c:213 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:233 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:234 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:235 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:250 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:251 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:252 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:252 -msgid "Both" -msgstr "Les deux" - #: ../midori/midori-websettings.c:253 -msgid "Both horizontal" -msgstr "Les deux horizontalement" +msgid "Icons and text" +msgstr "Icônes et texte" + +#: ../midori/midori-websettings.c:254 +msgid "Text beside icons" +msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:269 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:270 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:87 +#: ../midori/midori-websettings.c:271 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:534 ../extensions/shortcuts.c:94 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:287 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:288 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:289 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:344 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:353 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:360 +#: ../midori/midori-websettings.c:362 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:398 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Last Web search" msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "The last saved Web search" msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:435 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Whether to show the transferbar" -msgstr "Indique s'il faut afficher la barre de transferts" +msgstr "Indique s'il faut afficher la barre des transferts" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:476 -msgid "Toolbar Style" +#: ../midori/midori-websettings.c:478 +msgid "Toolbar Style:" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:479 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Show progress in location entry" msgstr "Progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:496 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "Search engines in location completion" msgstr "Moteurs de recherche dans la complétion" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:512 msgid "Whether to show search engines in the location completion" msgstr "" "Indique s'il faut afficher les moteurs de recherche dans les résultats de " "complétion de la barre d'adresse" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:530 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 +msgid "Show operating controls of the panel" +msgstr "Afficher les élements de contrôle du panneau" + +#: ../midori/midori-websettings.c:546 +msgid "Whether to show the operating controls of the panel" +msgstr "Indique s'il faut afficher les élements de contrôle du panneau" + +#: ../midori/midori-websettings.c:561 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:562 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:553 -msgid "Load on Startup" -msgstr "Charger au démarrage" +#: ../midori/midori-websettings.c:571 +msgid "When Midori starts:" +msgstr "Au lancement de Midori :" + +#: ../midori/midori-websettings.c:572 +msgid "What to do when Midori starts" +msgstr "Que faire au lancement de Midori" -#: ../midori/midori-websettings.c:554 -msgid "What to load on startup" -msgstr "Éléments à charger au démarrage" +#: ../midori/midori-websettings.c:581 +msgid "Homepage:" +msgstr "Page d'accueil :" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:582 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:597 msgid "Show crash dialog" msgstr "Fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:598 msgid "Show a dialog after Midori crashed" msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:614 msgid "Show speed dial in new tabs" msgstr "Appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:615 msgid "Show speed dial in newly opened tabs" -msgstr "Afficher une page d'appel rapide dans les nouveaux onglets" +msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:605 -msgid "Download Folder" -msgstr "Dossier des téléchargements" +#: ../midori/midori-websettings.c:623 +msgid "Save downloaded files to:" +msgstr "Enregistrer les téléchargements sous :" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:624 msgid "The folder downloaded files are saved to" -msgstr "Le dossier où enregistrer les téléchargements" +msgstr "Le dossier où enregistrer les fichiers téléchargés" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:645 msgid "Ask for the destination folder" msgstr "Demander le dossier de destination" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:646 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" "Indique s'il faut demander le dossier de destination quand un fichier est " "téléchargé." -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:665 msgid "Notify when a transfer has been completed" msgstr "Signaler la fin des transferts" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:666 msgid "Whether to show a notification when a transfer has been completed" msgstr "Indique s'il faut signaler la fin d'un transfert par une notification" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:678 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:679 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:687 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:688 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:703 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:704 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:716 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:717 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:725 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:726 msgid "The preferred character encoding" msgstr "Encodage favori des caractères" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:736 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:737 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:745 msgid "Close Buttons on Tabs" msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:746 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:730 -msgid "Open new pages in" -msgstr "Ouvrir les nouvelles pages dans" +#: ../midori/midori-websettings.c:754 +msgid "Open new pages in:" +msgstr "Ouvrir les nouvelles pages dans :" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:755 msgid "Where to open new pages" msgstr "Lieu où les nouvelles pages doivent être ouvertes" -#: ../midori/midori-websettings.c:740 -msgid "Open external pages in" -msgstr "Ouvrir les pages externes dans" +#: ../midori/midori-websettings.c:768 +msgid "Open external pages in:" +msgstr "Ouvrir les pages externes dans :" -#: ../midori/midori-websettings.c:741 +#: ../midori/midori-websettings.c:769 msgid "Where to open externally opened pages" msgstr "Lieu où les pages externes doivent être ouvertes" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:782 msgid "Middle click opens Selection" msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:783 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse de la sélection avec un clic du bouton central de la " "souris" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:791 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:792 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:800 msgid "Open Tabs next to Current" -msgstr "Ouvrir les onglets à côté de l'onglet actuel" +msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:801 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou " -"après le dernier de la liste" +"après le dernier" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:809 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtre intempestives dans des onglets" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:810 msgid "Whether to open popup windows in tabs" msgstr "" -"Indique s'il faut ouvrir les fenêtres qui apparaissent intempestivement " -"(popups) dans des onglets" +"Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des " +"onglets" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:826 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:827 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:842 msgid "Find inline while typing" msgstr "Chercher pendant la saisie" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:843 msgid "Whether to automatically find inline while typing" msgstr "" "Indique s'il faut chercher automatiquement dans la page pendant la saisie" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:858 +msgid "Kinetic scrolling" +msgstr "Défilement cinétique" + +#: ../midori/midori-websettings.c:859 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" +"Indique si le défilement doit se déplacer cinétiquement en fonction " +"de la vitesse" + +#: ../midori/midori-websettings.c:867 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:868 msgid "What type of cookies to accept" -msgstr "Type de fichiers témoins à accepter" +msgstr "Type de fichiers témoins (cookies) à accepter" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:877 msgid "Original cookies only" msgstr "Uniquement les cookies d'origine" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:878 msgid "Accept cookies from the original website only" msgstr "Accepter les fichiers témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:886 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:887 msgid "The maximum number of days to save cookies for" msgstr "" "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:897 msgid "Remember last visited pages" msgstr "Se souvenir des dernières pages visitées" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:898 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:862 +#: ../midori/midori-websettings.c:906 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:907 msgid "The maximum number of days to save the history for" -msgstr "Le nombre maximal de jours pendant lequel conserver l'historique" +msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:871 -msgid "Remember last form inputs" -msgstr "Se souvenir du contenu des derniers formulaires remplis" - -#: ../midori/midori-websettings.c:872 -msgid "Whether the last form inputs are saved" -msgstr "" -"Indique s'il faut enregistrer le contenu des derniers formulaires remplis" - -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:915 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:916 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:926 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:927 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:907 +#: ../midori/midori-websettings.c:942 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:908 +#: ../midori/midori-websettings.c:943 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:959 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:960 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:976 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:977 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:950 -msgid "Cache size" -msgstr "Taille du cache" - -#: ../midori/midori-websettings.c:951 -msgid "The allowed size of the cache" -msgstr "La taille de l'antémémoire permise" - -#: ../midori/midori-websettings.c:966 +#: ../midori/midori-websettings.c:992 msgid "Clear private data" msgstr "Effacer les informations privées" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:993 msgid "The private data selected for deletion" -msgstr "Les informations privées sélectionnées pour suppression" +msgstr "Les informations privées sélectionnées pour la suppression" -# pas très content -#: ../midori/midori-view.c:750 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:911 ../midori/midori-view.c:3766 +#: ../midori/midori-view.c:3770 +#, c-format +msgid "Error - %s" +msgstr "Erreur - %s" + +#: ../midori/midori-view.c:912 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, -#. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Erreur" - -#: ../midori/midori-view.c:755 +#: ../midori/midori-view.c:917 msgid "Try again" msgstr "Essayer une autre fois" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 +#: ../midori/midori-view.c:950 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1172 +#: ../midori/midori-view.c:1164 ../midori/midori-view.c:1878 +#, c-format +msgid "Send a message to %s" +msgstr "Envoyer un message à %s" + +#: ../midori/midori-view.c:1717 ../midori/midori-view.c:1780 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:1174 +#: ../midori/midori-view.c:1720 ../midori/midori-view.c:1782 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1723 ../midori/midori-view.c:1789 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1197 -msgid "_Download Link destination" -msgstr "_Télécharger la cible du lien" +#: ../midori/midori-view.c:1726 +msgid "_Copy Link destination" +msgstr "_Copier l'adresse du lien" -#: ../midori/midori-view.c:1203 +#: ../midori/midori-view.c:1729 ../midori/midori-view.c:1801 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1730 ../midori/midori-view.c:1795 +msgid "_Download Link destination" +msgstr "_Télécharger la cible du lien" + +#: ../midori/midori-view.c:1734 ../midori/midori-view.c:1770 +#: ../midori/midori-view.c:1806 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:1241 +#: ../midori/midori-view.c:1746 +msgid "Open _Image in New Tab" +msgstr "Ouvrir l'image dans un nou_vel onglet" + +#: ../midori/midori-view.c:1749 +msgid "Open Image in New Wi_ndow" +msgstr "Ouvrir l'image dans une nouvelle fe_nêtre" + +#: ../midori/midori-view.c:1752 +msgid "Copy Image _Address" +msgstr "Copier l'_adresse de l'image" + +#: ../midori/midori-view.c:1755 +msgid "Save I_mage" +msgstr "Enregistrer l'i_mage" + +#: ../midori/midori-view.c:1756 +msgid "Download I_mage" +msgstr "Télécharger l'i_mage" + +#: ../midori/midori-view.c:1763 +msgid "Copy Video _Address" +msgstr "Copier l'_adresse de la vidéo" + +#: ../midori/midori-view.c:1766 +msgid "Save _Video" +msgstr "Enregistrer la _vidéo" + +#: ../midori/midori-view.c:1766 +msgid "Download _Video" +msgstr "Télécharger la _vidéo" + +#: ../midori/midori-view.c:1826 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:1269 +#: ../midori/midori-view.c:1854 ../midori/midori-view.c:1865 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1886 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1457 +#: ../midori/midori-view.c:2138 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:2155 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:2158 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1481 +#: ../midori/midori-view.c:2162 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1899 +#: ../midori/midori-view.c:2678 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:2089 +#: ../midori/midori-view.c:2889 msgid "Speed dial" msgstr "Appel rapide" -#: ../midori/midori-view.c:2090 +#: ../midori/midori-view.c:2890 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2891 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:2092 +#: ../midori/midori-view.c:2892 msgid "Enter shortcut title" msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:2093 +#: ../midori/midori-view.c:2893 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2923 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:2140 +#: ../midori/midori-view.c:2940 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:2487 +#: ../midori/midori-view.c:3065 +msgid "Blank page" +msgstr "Page vierge" + +#: ../midori/midori-view.c:3308 msgid "_Duplicate Tab" -msgstr "_Doubler l'onglet" +msgstr "_Dupliquer l'onglet" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Préférences pour %s" +#: ../midori/midori-view.c:3313 + +msgid "_Restore Tab" +msgstr "_Restorer l'onglet" + +#: ../midori/midori-view.c:3313 +msgid "_Minimize Tab" +msgstr "_Minimiser l'onglet" + +#: ../midori/midori-view.c:3872 +msgid "Print background images" +msgstr "Imprimer les images d'arrière-plan" + +#: ../midori/midori-view.c:3873 +msgid "Whether background images should be printed" +msgstr "Indique s'il faut imprimer les images d'arrière-plan" + +#: ../midori/midori-view.c:3917 ../midori/midori-preferences.c:388 +msgid "Features" +msgstr "Fonctionnalités" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:317 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:318 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:332 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:341 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:356 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:357 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:359 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:362 msgid "The default font family used to display text" msgstr "La police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:365 msgid "The default font size used to display text" -msgstr "La taille de la police utilisée par défaut pour afficher les textes" +msgstr "La taille par défaut de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:367 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:370 msgid "The font family used to display fixed-width text" -msgstr "" -"La taille de la police utilisée par défaut pour afficher les textes à " -"largeur fixe" +msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:373 msgid "The font size used to display fixed-width text" msgstr "" "La taille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:375 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:378 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Encodage" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Encodage par défaut des caractères" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:387 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Fonctionnalités" - -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 +#: ../midori/midori-preferences.c:391 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:392 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:402 msgid "Shrink images automatically" msgstr "Réduire la taille des images" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:403 msgid "Automatically shrink standalone images to fit" msgstr "" -"Réduire automatiquement la taille des images pour les adapter à celle de la " -"fenêtre" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Imprimer les images d'arrière-plan" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Indique s'il faut imprimer les images d'arrière-plan" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Zones de texte redimensionnables" +"Réduire automatiquement la taille des images pour les adapter à la fenêtre" -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Indique si les zones de texte peuvent être redimensionnées" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:412 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 +#: ../midori/midori-preferences.c:415 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:416 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" -msgstr "Activer la vérification d'orthographe" +msgstr "Activer la vérification de l'orthographe" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" -msgstr "Activer la vérification d'orthographe lors de la saisie" +msgstr "Activer la vérification de l'orthographe lors de la saisie" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:441 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "" -"Une liste de langues séparée par des virgules utilisée par le vérificateur " -"d'ortographe, par example « fr_FR,de_DE »" +"Une liste de langues séparées par des virgules, utilisées par le vérificateur " +"d'ortographe. Par example « fr_FR,de_DE,en_US »" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:449 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:460 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "Applications" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:653 -msgid "MB" -msgstr "Mo" - #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:518 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:519 msgid "Web Cookies" msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:537 msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 +#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:932 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:976 +#: ../midori/midori-searchaction.c:980 msgid "_Icon:" msgstr "_Icône :" -#: ../midori/midori-searchaction.c:990 +#: ../midori/midori-searchaction.c:994 msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1209 +#: ../midori/midori-searchaction.c:1213 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1308 +#: ../midori/midori-searchaction.c:1312 msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 +#: ../midori/sokoke.c:168 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:936 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:938 msgid "Add Boo_kmark" -msgstr "Ajouter un _signet" +msgstr "Ajouter un s_ignet" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:939 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:940 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:941 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:942 msgid "_Homepage" -msgstr "_Page d'accueil" +msgstr "Page d'a_ccueil" -#: ../midori/sokoke.c:869 +#: ../midori/sokoke.c:943 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:870 -msgid "User_styles" -msgstr "_Styles utilisateur" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:944 msgid "New _Tab" -msgstr "Nouvel _onglet" +msgstr "Nouvel o_nglet" -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:945 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:873 +#: ../midori/sokoke.c:946 msgid "Netscape p_lugins" msgstr "Greffons _Netscape" -#: ../midori/sokoke.c:875 -msgid "New _Window" -msgstr "Nouvelle _fenêtre" - -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Styles utilisateur" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "" +"Copier le scripts utilisateur dans le dossier %s et les styles utilisateurs" +" dans le dossier %s." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Ne peut contrôler le dossier « %s » : %s" + #: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Signets" @@ -1790,7 +1903,7 @@ msgstr "Supprimer le signet sélectionné" #: ../panels/midori-bookmarks.c:260 msgid "Add a new folder" -msgstr "Ajouter un nouveau répertoire" +msgstr "Ajouter un nouveau dossier" #: ../panels/midori-bookmarks.c:592 msgid "Separator" @@ -1818,24 +1931,35 @@ msgstr "Supprimer l'élément sélectionné dans l'historique" #: ../panels/midori-history.c:234 msgid "Clear the entire history" -msgstr "Vider l'historique tout entier" +msgstr "Effacer tout l'historique" + +#: ../panels/midori-history.c:600 +msgid "Erroneous clock time" +msgstr "Temps d'horloge incorrect" #: ../panels/midori-history.c:601 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" +"L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la " +"date et l'heure." + +#: ../panels/midori-history.c:613 msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:618 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Il y a %d jour" msgstr[1] "Il y a %d jours" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:626 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:628 msgid "Yesterday" msgstr "Hier" @@ -1843,24 +1967,19 @@ msgstr "Hier" msgid "Netscape plugins" msgstr "Greffons Netscape" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" msgstr "Ouvrir le _dossier de destination" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" msgstr "Copier l'_adresse du lien" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "Authentification requise" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" @@ -1868,14 +1987,18 @@ msgstr "" "Un nom d'utilisateur et un mot de passe sont requis\n" "pour l'ouverture de cet emplacement :" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Nom d'utilisateur" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Mot de passe" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "Se _souvenir du mot de passe" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1890,32 +2013,47 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:376 ../katze/katze-utils.c:740 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:451 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:437 msgid "Choose folder" -msgstr "Choisissez un répertoire" +msgstr "Choisissez un dossier" + +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "Préférences pour %s" -#: ../extensions/adblock.c:128 +#: ../extensions/adblock.c:345 msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:269 +#: ../extensions/adblock.c:375 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte " +"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " +"listes à %s." + +#: ../extensions/adblock.c:513 msgid "Configure _Advertisement filters..." msgstr "Configurer les filtres de _publicité" -#: ../extensions/adblock.c:526 +#: ../extensions/adblock.c:916 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:527 +#: ../extensions/adblock.c:917 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" @@ -1936,13 +2074,17 @@ msgstr "Donner une couleur distincte à chaque onglet" msgid "Cookie Manager" msgstr "Gestionnaire de cookies" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Supprimer tous" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -"Effacer tous les fichiers témoins. S'il y a un filtre, seulement les fichies " -"témoins sont effacé que correspandent au filtre." +"Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls " +"les fichiers témoins correspondant au filtre seront effacés." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" @@ -1962,7 +2104,7 @@ msgstr "Question" #: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." -msgstr "Seuls les fichiers témoins qui correspondent au filtre seront effacés." +msgstr "Seuls les fichiers témoins correspondant au filtre seront effacés." #: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" @@ -2015,8 +2157,8 @@ msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" msgstr "" -"Entrer un filtre pour afficher seulement les cookies dont le nom ou le " -"domaine correspond au filtre entré." +"Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine " +"correspondent au filtre entré." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2026,15 +2168,25 @@ msgstr "Gestionnaire de _cookies" msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les fichiers témoins" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Préchargement de DNS" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Précharge l'adresse IP de liens survolés" + +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" -"Impossible de trouver l'élément \"entry\" ATOM requise dans les données XML." +"Impossible de trouver les éléments ATOM \"entry\" requis dans les données " +"XML." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" -"Impossible de trouver l'élément \"feed\" ATOM requis dans les données XML." +"Impossible de trouver les éléments ATOM \"feed\" requis dans les données " +"XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2043,33 +2195,33 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Dernière mise à jour : %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Flux" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Ajouter un nouveau flux" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Supprimer un flux" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Flux" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Impossible de trouver l'élément racine dans les données XML du flux." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Format de flux non pris en charge." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Impossible d'analyser le flux XML: %s" @@ -2085,7 +2237,8 @@ msgstr "La version trouvée du flux RSS n'est pas prise en charge." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Impossible de trouver l'élément requis \"item\" dans les données XML." +msgstr "" +"Impossible de trouver les éléments \"item\" requis dans les données XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." @@ -2093,33 +2246,50 @@ msgstr "" "Impossible de trouver les éléments RSS \"channel\" requis dans les données " "XML." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Erreur" + +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" msgstr "Le flux « %s » existe déjà" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" msgstr "Erreur lors du chargement du flux « %s »" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Nouveau flux" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "Panneau de flux" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:342 +msgid "Stores history of entered form data" +msgstr "Stocke l'historique des saisies de formulaire" + +#: ../extensions/formhistory.c:346 +#, c-format +msgid "Not available: %s" +msgstr "Non disponible : %s" + +#: ../extensions/formhistory.c:347 +msgid "Resource files not installed" +msgstr "Fichiers ressources non installés" + +#: ../extensions/formhistory.c:353 +msgid "Form history filler" +msgstr "Autocomplétion des formulaires" + +#: ../extensions/mouse-gestures/main.c:246 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures/main.c:247 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" @@ -2132,19 +2302,23 @@ msgstr "Cadre de pages" msgid "_Pageholder" msgstr "Cadre de _pages" -#: ../extensions/shortcuts.c:166 -msgid "Configure Keyboard shortcuts" -msgstr "Configurer les raccourcis clavier" +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Garder une ou plusieurs pages ouvertes en parallèle à vos onglets" -#: ../extensions/shortcuts.c:263 -msgid "Configure Sh_ortcuts..." -msgstr "Configurer les racc_ourcis..." +#: ../extensions/shortcuts.c:173 +msgid "Customize Keyboard shortcuts" +msgstr "Personnaliser les raccourcis clavier" -#: ../extensions/shortcuts.c:295 +#: ../extensions/shortcuts.c:265 +msgid "Customize Sh_ortcuts..." +msgstr "_Personnaliser les raccourcis..." + +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Raccourcis" -#: ../extensions/shortcuts.c:296 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Afficher et modifier les raccourcis clavier" @@ -2163,47 +2337,98 @@ msgstr "Fonctionnalités dans la barre d'état" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "" -"Permet de facilement activer et désactiver des fonctionnalités sur les pages " -"Internet" +"Activer et désactiver facilement des fonctionnalités sur les pages Internet" -#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +#: ../extensions/tab-panel.c:562 ../extensions/tab-panel.c:619 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:336 +#: ../extensions/tab-panel.c:603 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:353 +#: ../extensions/tab-panel.c:620 msgid "Show tabs in a vertical panel" -msgstr "" +msgstr "Afficher les onglets dans un panneau vertical" -#: ../extensions/toolbar-editor.c:390 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" -msgstr "" +msgstr "Personnaliser la barre d'outils" -#: ../extensions/toolbar-editor.c:406 +#: ../extensions/toolbar-editor.c:407 msgid "" "Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" +"Sélectionnez les éléments à afficher sur la barre d'outils.\n" +"Ils peuvent être réorganisés par glisser-déposer." -#: ../extensions/toolbar-editor.c:422 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" -msgstr "" +msgstr "Éléments disponibles" -#: ../extensions/toolbar-editor.c:443 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" -msgstr "" +msgstr "Éléments affichés" -#: ../extensions/toolbar-editor.c:584 -msgid "Configure _Toolbar..." -msgstr "Configurer la barre d'outi_ls..." +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "Personnaliser la barre d'outi_ls..." -#: ../extensions/toolbar-editor.c:613 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" -msgstr "Editeur de la barre d'outils" +msgstr "Éditeur de barre d'outils" #: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" -msgstr "Personnaliser la barre d'outils à l'aise" +msgstr "Éditer facilement la disposition de la barre d'outils" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "Non disponible sur cette plate-forme" + +#~ msgid "_Closed Tabs and Windows" +#~ msgstr "Onglets et fenêtres _fermés" + +#~ msgid "Last open pages" +#~ msgstr "Dernières pages ouvertes" + +#~ msgid "Both" +#~ msgstr "Les deux" + +#~ msgid "Both horizontal" +#~ msgstr "Les deux horizontalement" + +#~ msgid "Load on Startup" +#~ msgstr "Charger au démarrage" + +#~ msgid "Remember last form inputs" +#~ msgstr "Se souvenir du contenu des derniers formulaires remplis" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "" +#~ "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" + +#~ msgid "Cache size" +#~ msgstr "Taille du cache" + +#~ msgid "The allowed size of the cache" +#~ msgstr "La taille de l'antémémoire permise" + +#~ msgid "Encoding" +#~ msgstr "Encodage" + +#~ msgid "The character encoding to use by default" +#~ msgstr "Encodage par défaut des caractères" + +#~ msgid "Resizable text areas" +#~ msgstr "Zones de texte redimensionnables" + +#~ msgid "Whether text areas are resizable" +#~ msgstr "Indique si les zones de texte peuvent être redimensionnées" + +#~ msgid "MB" +#~ msgstr "Mo" + +#~ msgid "User_styles" +#~ msgstr "_Styles utilisateur" diff --git a/po/gl.po b/po/gl.po index 8fe65709..650a8e76 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,1594 +1,2260 @@ -# Galician translations for midori package. +# Galician translation of midori # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER -# This file is distributed under the same license as the midori package. -# Miguel Anxo Bouzada 2008 +# Copyright (C) 2008, 2009 Miguel Anxo Bouzada. +# Copyright (C) 2009 Leandro Regueiro. +# This file is distributed under the same license as the Xfce package. +# +# Miguel Anxo Bouzada 2008, 2009. +# Leandro Regueiro , 2009. +# +# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas +# colaborar connosco, podes atopar máis información en # msgid "" msgstr "" -"Project-Id-Version: midori-0.0.18\n" +"Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-07-20 13:42+0100\n" -"Last-Translator: Miguel Anxo Bouzada \n" -"Language-Team: GALPon MiniNo \n" +"POT-Creation-Date: 2009-09-06 00:44+0200\n" +"PO-Revision-Date: 2009-11-06 12:10+0100\n" +"Last-Translator: Leandro Regueiro \n" +"Language-Team: Galician \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Navegador lixeiro" - -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +msgstr "Navegador web lixeiro" + +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1435 +#: ../midori/main.c:1609 +#: ../midori/main.c:1617 +#: ../midori/main.c:1628 +#: ../midori/midori-websettings.c:287 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navegador" - -#: ../midori/main.c:86 -msgid "_Bookmark" -msgstr "_Marcapáxina" - -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 -msgid "_Bookmarks" -msgstr "_Marcapáxinas" - -#: ../midori/main.c:88 -msgid "_Add Bookmark" -msgstr "_Engadir marcapáxinas" - -#: ../midori/main.c:89 -msgid "_Console" -msgstr "_Consola" - -#: ../midori/main.c:90 -msgid "_Extensions" -msgstr "_Extensións" - -#: ../midori/main.c:91 -msgid "_History" -msgstr "_Histórico" - -#: ../midori/main.c:92 -msgid "_Homepage" -msgstr "P_áxina de inicio" +msgstr "Navegador web" -#: ../midori/main.c:93 -msgid "_Userscripts" -msgstr "_Scripts de usuario" - -#: ../midori/main.c:94 -msgid "User_styles" -msgstr "_Estilos de usuario" - -#: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Nova lingüe_ta" - -#: ../midori/main.c:96 -msgid "_Transfers" -msgstr "_Transferencias" - -#: ../midori/main.c:97 -msgid "_Closed Tabs and Windows" -msgstr "" - -#: ../midori/main.c:98 -msgid "New _Window" -msgstr "Nova _ventá" - -#: ../midori/main.c:143 -#, fuzzy, c-format +#: ../midori/main.c:102 +#, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Non se puido cargar a configuración. %s\n" +msgstr "Non se puido cargar a configuración: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor «%s» non é válido para %s" -#: ../midori/main.c:205 ../midori/main.c:275 -#, fuzzy, c-format +#: ../midori/main.c:164 +#: ../midori/main.c:245 +#, c-format msgid "Invalid configuration value '%s'" -msgstr "Non se poden axustar as propiedades «%s»" +msgstr "O valor de configuración «%s» non é válido" -#: ../midori/main.c:532 -msgid "File not found." -msgstr "Non se atopa o ficheiro." - -#: ../midori/main.c:540 ../midori/main.c:549 -msgid "Malformed document." -msgstr "Documento defectuoso" - -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:369 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Fallou ao abrir a base de datos: %s\n" + +#: ../midori/main.c:401 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Fallou ao executar a declaración na base de datos: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:455 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Fallou ao eliminar o elemento do historial: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:479 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Fallou ao limpar o historial: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:502 +#: ../midori/main.c:536 +#: ../midori/main.c:552 #, c-format msgid "Failed to add history item: %s\n" -msgstr "" +msgstr "Fallou ao engadir o elemento ao historial: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:731 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Fallou ao eliminar elementos antigos do historial: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 +#: ../midori/main.c:760 #, c-format -msgid "Writing failed." -msgstr "Fallou a escritura." +msgid "The configuration couldn't be saved. %s" +msgstr "Non se puido gardar a configuración. %s" -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transferencias" +#: ../midori/main.c:798 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Non se puideron gardar os motores de busca. %s" + +#: ../midori/main.c:817 +#: ../midori/main.c:845 +#: ../midori/main.c:874 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Non se puideron gardar os marcadores. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:897 +#: ../midori/main.c:920 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Non se puido gardar o lixo. %s" -#: ../midori/main.c:1040 +#: ../midori/main.c:993 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non se puido gardar a sesión. %s" -#: ../midori/main.c:1297 +#: ../midori/main.c:1190 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Parece que Midori pechou inesperadamente a última vez. Se isto xa ocorreu varias veces, probe unha das seguintes opcións para resolver o problema." + +#: ../midori/main.c:1205 +msgid "Modify _preferences" +msgstr "Modificar as _preferencias" + +#: ../midori/main.c:1209 +msgid "Reset the last _session" +msgstr "Restablecer a última _sesión" + +#: ../midori/main.c:1214 +msgid "Disable all _extensions" +msgstr "Desactivar tódalas _extensións" + +#: ../midori/main.c:1435 +msgid "No filename specified" +msgstr "Nome de ficheiro sen especificar" + +#: ../midori/main.c:1458 +msgid "An unknown error occured." +msgstr "Produciuse un erro descoñecido:" + +#: ../midori/main.c:1490 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Captura gardada en: %s\n" + +#: ../midori/main.c:1539 +msgid "Run ADDRESS as a web application" +msgstr "Executar ENDEREZO como un aplicativo web" + +#: ../midori/main.c:1539 +msgid "ADDRESS" +msgstr "ENDEREZO" + +#: ../midori/main.c:1541 +msgid "Use FOLDER as configuration folder" +msgstr "Usar CARTAFOL como cartafol de configuración" + +#: ../midori/main.c:1541 +msgid "FOLDER" +msgstr "CARTAFOL" + +#: ../midori/main.c:1543 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "Execute o nome de ficheiro especificado como JavaScript" -#: ../midori/main.c:1299 +#: ../midori/main.c:1546 +msgid "Take a snapshot of the specified URI" +msgstr "Facer unha captura do URI específicado" + +#: ../midori/main.c:1549 +msgid "Execute the specified command" +msgstr "Executar o comando especificado" + +#: ../midori/main.c:1551 msgid "Display program version" -msgstr "Amosar a versión do programa" +msgstr "Mostrar a versión do programa" -#: ../midori/main.c:1301 -#, fuzzy -msgid "URIs" -msgstr "URI" +#: ../midori/main.c:1553 +msgid "Addresses" +msgstr "Enderezos" -#: ../midori/main.c:1335 -#, fuzzy -msgid "[URIs]" -msgstr "[URL]" +#: ../midori/main.c:1606 +msgid "[Addresses]" +msgstr "[Enderezos]" -#: ../midori/main.c:1371 +#: ../midori/main.c:1629 msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envíe comentarios, suxerencias e problemas a:" +msgstr "Por favor, envíe comentarios, suxestións e erros a:" -#: ../midori/main.c:1373 +#: ../midori/main.c:1631 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "" +#: ../midori/main.c:1711 +msgid "The specified configuration folder is invalid." +msgstr "O cartafol de configuración especificado non é correcto." -#: ../midori/main.c:1411 -#, c-format +#: ../midori/main.c:1751 msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "Xa se está a executar outra instancia de Midori pero non responde.\n" + +#: ../midori/main.c:1795 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Non se puideron cargar os motores de busca. %s\n" -#: ../midori/main.c:1447 -#, fuzzy, c-format +#: ../midori/main.c:1813 +#, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Os marcapáxinas non puideron ser cargados. %s\n" +msgstr "Non se puideron cargar os marcadores: %s\n" -#: ../midori/main.c:1463 -#, fuzzy, c-format +#: ../midori/main.c:1828 +#, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Non se puido cargar a sesión. %s\n" +msgstr "Non se puido cargar a sesión: %s\n" -#: ../midori/main.c:1477 -#, fuzzy, c-format +#: ../midori/main.c:1841 +#, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Non se puido cargar a «Cesta do lixo». %s\n" +msgstr "Non se puido cargar o lixo: %s\n" -#: ../midori/main.c:1491 -#, fuzzy, c-format +#: ../midori/main.c:1854 +#, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Non se puido cargar a «Cesta do lixo». %s\n" +msgstr "Non se puido cargar o historial: %s\n" -#: ../midori/main.c:1504 +#: ../midori/main.c:1866 msgid "The following errors occured:" -msgstr "Producíronse os seguinte erros:" +msgstr "Producíronse os seguintes erros:" -#: ../midori/main.c:1520 +#: ../midori/main.c:1882 msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Non se puido gardar o motor de busca. %s" +msgstr "_Ignorar" -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Non se puideron gardar os marcapáxinas. %s" +#: ../midori/midori-array.c:251 +msgid "File not found." +msgstr "Non se atopou o ficheiro." -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Non se puido gardar a «cesta do lixo». %s" +#: ../midori/midori-array.c:260 +#: ../midori/midori-array.c:270 +msgid "Malformed document." +msgstr "Documento defectuoso" -#: ../midori/main.c:1715 +#: ../midori/midori-array.c:432 +#: ../midori/sokoke.c:699 #, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Non se puido gardar a configuración. %s" +msgid "Writing failed." +msgstr "Fallou a escritura." -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:315 +#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4333 msgid "Reload the current page" -msgstr "Cargar novamente a páxina actual" +msgstr "Recargar a páxina actual" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:326 +#: ../midori/midori-browser.c:4330 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:417 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:442 #, c-format msgid "Unexpected action '%s'." msgstr "Acción non esperada «%s»" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:627 +msgid "New folder" +msgstr "Cartafol novo" + +#: ../midori/midori-browser.c:627 +msgid "Edit folder" +msgstr "Editar cartafol" + +#: ../midori/midori-browser.c:629 msgid "New bookmark" -msgstr "Novo marcapáxinas" +msgstr "Novo marcador" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:629 msgid "Edit bookmark" -msgstr "Editar o marcapáxinas" +msgstr "Editar o marcador" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:659 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:672 +#: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descrición" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:691 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:368 +msgid "_Address:" +msgstr "_Enderezo:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:710 msgid "_Folder:" msgstr "_Cartafol:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Raiz" +#: ../midori/midori-browser.c:715 +#: ../midori/midori-browser.c:756 +msgid "Toplevel folder" +msgstr "Cartafol principal" -#: ../midori/midori-browser.c:668 -#, fuzzy +#: ../midori/midori-browser.c:834 msgid "Save file as" -msgstr "Gardar nun ficheiro" +msgstr "Gardar o ficheiro como" + +#: ../midori/midori-browser.c:1211 +#: ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" #: ../midori/midori-browser.c:1248 -#, fuzzy -msgid "Open file" -msgstr "Abrir un ficheiro" +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Descargouse o ficheiro '%s'." + +#: ../midori/midori-browser.c:1252 +msgid "Transfer completed" +msgstr "Transferencia completada" + +#: ../midori/midori-browser.c:1393 +msgid "Save file" +msgstr "Gardar ficheiro" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2060 +msgid "Open file" +msgstr "Abrir ficheiro" + +#: ../midori/midori-browser.c:3268 +#: ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nova fonte" + +#: ../midori/midori-browser.c:3523 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 +msgid "Open all in _Tabs" +msgstr "Abrir todo en lingüe_tas" + +#: ../midori/midori-browser.c:3530 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" -msgstr "Abrir nunha nova _lingüeta " +msgstr "Abrir nunha nova lingüe_ta " -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:3533 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" -msgstr "Abrir nunha nova _ventá" +msgstr "Abrir nunha nova _xanela" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Separador" +#: ../midori/midori-browser.c:3843 +msgid "Clear Private Data" +msgstr "Limpar os datos privados" -#: ../midori/midori-browser.c:2712 -#, c-format -msgid "A week ago" -msgstr "" +#: ../midori/midori-browser.c:3847 +msgid "_Clear private data" +msgstr "_Limpar os datos privados" -#: ../midori/midori-browser.c:2718 -#, c-format -msgid "%d days ago" -msgstr "" +#: ../midori/midori-browser.c:3860 +msgid "Clear the following data:" +msgstr "Limpar os seguintes datos:" -#: ../midori/midori-browser.c:2725 -msgid "Today" -msgstr "" +#: ../midori/midori-browser.c:3870 +#: ../midori/midori-preferences.c:665 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historial" -#: ../midori/midori-browser.c:2727 -msgid "Yesterday" -msgstr "" +#: ../midori/midori-browser.c:3875 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3880 +msgid "'Flash' Cookies" +msgstr "Cookies de «Flash»" + +#: ../midori/midori-browser.c:3885 +msgid "Website icons" +msgstr "Iconas de sitios web" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:3890 +#: ../midori/sokoke.c:873 +msgid "_Closed Tabs" +msgstr "_Lingüetas pechadas" + +#: ../midori/midori-browser.c:3898 +msgid "Clear private data when _quitting Midori" +msgstr "_Limpar os datos privados ao saír de Midori" + +#: ../midori/midori-browser.c:3979 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3995 msgid "translator-credits" msgstr "" -"Miguel Anxo Bouzada\n" -"Antonio Sanchez" - -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" -msgstr "" +"Miguel Anxo Bouzada, 2008, 2009\n" +"Leandro Regueiro , 2009\n" +"\n" +"Proxecto Trasno http://trasno.net" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:4261 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:4263 +#: ../midori/sokoke.c:874 +msgid "New _Window" +msgstr "Nova _xanela" + +#: ../midori/midori-browser.c:4264 msgid "Open a new window" -msgstr "Abrir unha nova ventá" +msgstr "Abrir unha nova xanela" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:4267 msgid "Open a new tab" msgstr "Abrir unha nova lingüeta" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:4270 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:4273 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:4275 +msgid "Add to Speed _dial" +msgstr "Enga_dir a marcación rápida" + +#: ../midori/midori-browser.c:4276 +msgid "Add shortcut to speed dial" +msgstr "Engadir atallo á marcación rápida" + +#: ../midori/midori-browser.c:4278 msgid "_Close Tab" msgstr "Pechar _lingüeta" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:4279 msgid "Close the current tab" msgstr "Pechar a lingüeta actual" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:4281 msgid "C_lose Window" -msgstr "_Pechar a ventá" +msgstr "_Pechar a xanela" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:4282 msgid "Close this window" -msgstr "Pechar esta ventá" +msgstr "Pechar esta xanela" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:4285 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:4288 msgid "Quit the application" -msgstr "Sair da aplicación" +msgstr "Saír do aplicativo" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:4290 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:4293 msgid "Cut the selected text" -msgstr "Copiar o texto seleccionado" +msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4299 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:4302 msgid "Paste text from the clipboard" -msgstr "Pegar o texto seleccionado no porta papeis" +msgstr "Pegar o texto seleccionado no portarretallos" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:4305 msgid "Delete the selected text" msgstr "Borrar o texto seleccionado" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:4308 msgid "Select all text" msgstr "Seleccionar todo o texto" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:4311 msgid "Find a word or phrase in the page" -msgstr "Buscar palabra ou frase nesta páxina" +msgstr "Buscar unha palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:4313 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:4314 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar a seguinte coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:4316 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:4317 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar a anterior coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:3120 -msgid "_Quick Find" -msgstr "Busca _rapida" - -#: ../midori/midori-browser.c:3121 -msgid "Quickly jump to a word or phrase" -msgstr "Salto rápido a unha palabra ou frase" - -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:4321 msgid "Configure the application preferences" -msgstr "Configurar as preferencias da aplicación" +msgstr "Configurar as preferencias do aplicativo" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:4323 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:4324 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:4336 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:4339 msgid "Decrease the zoom level" -msgstr "Diminuir o nivel de zoom" +msgstr "Diminuír o nivel de zoom" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:4342 msgid "Reset the zoom level" -msgstr "Reiniciar o nivel de zoom" +msgstr "Restablecer o nivel de zoom" + +#: ../midori/midori-browser.c:4343 +msgid "_Encoding" +msgstr "_Codificación" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 -msgid "View _Source" -msgstr "Amosar _código fonte" +#: ../midori/midori-browser.c:4345 +msgid "View So_urce" +msgstr "Ver o códi_go da páxina" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:4346 msgid "View the source code of the page" msgstr "Ver o código fonte da páxina" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:4348 msgid "View Selection Source" -msgstr "Amosar código fonte da páxina seleccionada" +msgstr "Mostrar código da selección" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:4349 msgid "View the source code of the selection" msgstr "Ver o código fonte da selección" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:4353 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:4355 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:4358 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:4361 msgid "Go forward to the next page" -msgstr "Avanzar á seguinte páxina" +msgstr "Ir á seguinte páxina" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:4364 msgid "Go to your homepage" -msgstr "Ir a súa páxina de inicio" +msgstr "Ir á súa páxina de inicio" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:4366 msgid "Empty Trash" -msgstr "Baleirar a cesta do lixo" +msgstr "Baleirar o lixo" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:4367 msgid "Delete the contents of the trash" msgstr "Borrar o contido do lixo" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 -msgid "Undo Close Tab" -msgstr "Desfacer o peche de lingüeta" +#: ../midori/midori-browser.c:4369 +msgid "Undo _Close Tab" +msgstr "Desfa_cer pechar lingüeta" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:4370 msgid "Open the last closed tab" msgstr "Abrir a última lingüeta pechada" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:4374 +#: ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" -msgstr "Engadir novo marcapáxinas" +msgstr "Engadir novo marcador" -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "Editar o marcapáxinas seleccionado" +#: ../midori/midori-browser.c:4376 +msgid "Add a new _folder" +msgstr "Engadir un carta_fol novo" -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "Borrar o marcapáxinas seleccionado" - -#: ../midori/midori-browser.c:3185 -#, fuzzy -msgid "Delete the selected history item" -msgstr "Borrar o texto seleccionado" +#: ../midori/midori-browser.c:4377 +msgid "Add a new bookmark folder" +msgstr "Engadir un novo cartafol de marcadores" -#: ../midori/midori-browser.c:3188 -msgid "Clear the entire history" -msgstr "" - -#: ../midori/midori-browser.c:3191 -#, fuzzy -msgid "Bookmark the selected history item" -msgstr "Copiar o texto seleccionado" - -#: ../midori/midori-browser.c:3193 -msgid "_Tools" -msgstr "_Ferramentas" - -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:4379 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:4380 msgid "Add, edit and remove search engines..." msgstr "Engadir, editar ou eliminar motores de busca..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:4383 +msgid "_Clear Private Data" +msgstr "_Limpar datos privados" + +#: ../midori/midori-browser.c:4384 +msgid "Clear private data..." +msgstr "Limpar os datos privados..." + +#: ../midori/midori-browser.c:4388 msgid "_Previous Tab" msgstr "Lingüeta _anterior" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:4389 msgid "Switch to the previous tab" -msgstr "Cambiar a lingüeta anterior" +msgstr "Cambiar á lingüeta anterior" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:4391 msgid "_Next Tab" msgstr "Lingüeta _seguinte" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:4392 msgid "Switch to the next tab" -msgstr "Cambiar a lingüeta seguinte" +msgstr "Cambiar á lingüeta seguinte" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:4394 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:4396 msgid "_Contents" msgstr "_Contido" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:4397 msgid "Show the documentation" -msgstr "Amosar a documentación" +msgstr "Mostrar a documentación" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" -msgstr "" +#: ../midori/midori-browser.c:4399 +msgid "_Frequent Questions" +msgstr "Preguntas _frecuentes" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:4400 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "Mostrar as preguntas frecuentes" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "" +#: ../midori/midori-browser.c:4402 +msgid "_Report a Bug" +msgstr "_Comunicar un erro" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:4403 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Abrir o xestor de reporte de fallos de Midori" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:4406 msgid "Show information about the program" -msgstr "Amosar información sobre o programa" +msgstr "Mostrar información sobre o programa" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:4413 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:4414 msgid "Don't save any private data while browsing" msgstr "Non gardar datos privados durante a navegación" -#: ../midori/midori-browser.c:3231 -#, fuzzy +#: ../midori/midori-browser.c:4419 msgid "_Menubar" -msgstr "Barra do menú" +msgstr "Barra de _menú" -#: ../midori/midori-browser.c:3232 -#, fuzzy +#: ../midori/midori-browser.c:4420 msgid "Show menubar" -msgstr "Barra de menu" +msgstr "Mostrar barra de menú" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:4423 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:4424 msgid "Show navigationbar" -msgstr "Amosar a barra de navegación" +msgstr "Mostrar a barra de navegación" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:4427 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:4428 msgid "Show sidepanel" -msgstr "Amosar panel lateral" +msgstr "Mostrar panel lateral" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:4431 msgid "_Bookmarkbar" -msgstr "Barra de marcapáxinas" +msgstr "Barra de marcadores" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:4432 msgid "Show bookmarkbar" -msgstr "Amosar a barra de marcapáxinas" +msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:4435 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:4436 msgid "Show transferbar" -msgstr "Amosar a barra de transferencias" +msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:4439 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:4440 msgid "Show statusbar" -msgstr "Amosar a barra de estado" +msgstr "Mostrar a barra de estado" + +#: ../midori/midori-browser.c:4447 +msgid "_Automatic" +msgstr "_Automático" + +#: ../midori/midori-browser.c:4450 +#: ../midori/midori-websettings.c:214 +msgid "Chinese (BIG5)" +msgstr "Chinés (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4454 +msgid "Japanese (SHIFT__JIS)" +msgstr "Xaponés (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4457 +#: ../midori/midori-websettings.c:216 +msgid "Russian (KOI8-R)" +msgstr "Ruso (KOI8-R)" + +#: ../midori/midori-browser.c:4460 +#: ../midori/midori-websettings.c:217 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:4463 +#: ../midori/midori-websettings.c:218 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:4466 +#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:291 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:4907 +msgid "_Separator" +msgstr "_Separador" + +#: ../midori/midori-browser.c:4914 msgid "_Location..." -msgstr "Ubicación..." +msgstr "Localización..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:4916 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:4940 msgid "_Web Search..." msgstr "Buscar na _web..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:4942 msgid "Run a web search" -msgstr "Proceder a busca na web" +msgstr "Executar unha busca na web" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:4963 msgid "Reopen a previously closed tab or window" -msgstr "Voltar a abrir ventás ou lingüetas pechadas" +msgstr "Volver abrir xanelas ou lingüetas pechadas" -#: ../midori/midori-browser.c:3729 -#, fuzzy +#: ../midori/midori-browser.c:4978 msgid "_Recently visited pages" -msgstr "Recordar as últimas páxinas visitadas" +msgstr "Páxinas visitadas _recentemente" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:4980 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Volver abrir as páxinas que visitou antes" + +#: ../midori/midori-browser.c:4995 +#: ../midori/sokoke.c:862 +msgid "_Bookmarks" +msgstr "_Marcadores" -#: ../midori/midori-browser.c:3746 -#, fuzzy +#: ../midori/midori-browser.c:4997 msgid "Show the saved bookmarks" -msgstr "Abrir o marcapáxinas seleccionado" +msgstr "Mostrar os marcadores gardados" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:5012 +msgid "_Tools" +msgstr "_Ferramentas" + +#: ../midori/midori-browser.c:5024 msgid "_Window" -msgstr "_Ventá" +msgstr "_Xanela" -#: ../midori/midori-browser.c:3761 -#, fuzzy +#: ../midori/midori-browser.c:5026 msgid "Show a list of all open tabs" -msgstr "Amosar unha visión xeral de todas as lingüetas abertas" +msgstr "Mostrar unha lista de tódalas lingüetas abertas" -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Marcapáxinas" +#: ../midori/midori-browser.c:5040 +msgid "_Menu" +msgstr "_Menú" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 -msgid "History" -msgstr "Histórico" +#: ../midori/midori-browser.c:5042 +msgid "Menu" +msgstr "Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" +#: ../midori/midori-browser.c:5228 +msgid "_Inline Find:" msgstr "_Busca en liña:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:5253 +msgid "Previous" +msgstr "Anterior" + +#: ../midori/midori-browser.c:5258 +msgid "Next" +msgstr "Seguinte" + +#: ../midori/midori-browser.c:5263 msgid "Match Case" -msgstr "Sensible a maiúsculas" +msgstr "Diferenciar maiúsculas de minúsculas" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:5271 msgid "Highlight Matches" -msgstr "" +msgstr "Resaltar coincidencias" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:5281 msgid "Close Findbar" -msgstr "Pechar barra de buscas" +msgstr "Pechar a barra de buscas" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:5316 +#: ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "Limpar todo" + +#: ../midori/midori-browser.c:5670 #, c-format msgid "Unexpected setting '%s'" -msgstr "Axuste non esperado «%s»" +msgstr "Opción non esperada «%s»" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-locationaction.c:941 +#, c-format +msgid "Search with %s" +msgstr "Buscar con %s" + +#: ../midori/midori-panel.c:382 +#: ../midori/midori-panel.c:384 +msgid "Detach chosen panel from the window" +msgstr "Separar o panel seleccionado da xanela " + +#: ../midori/midori-panel.c:394 +#: ../midori/midori-panel.c:396 +#: ../midori/midori-panel.c:577 +#: ../midori/midori-panel.c:580 +msgid "Align sidepanel to the right" +msgstr "Aliñar o panel lateral á dereita" + +#: ../midori/midori-panel.c:406 +#: ../midori/midori-panel.c:407 msgid "Close panel" -msgstr "Perchar o panel" +msgstr "Pechar o panel" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 -msgid "Blank page" -msgstr "Páxina baleira" +#: ../midori/midori-panel.c:578 +#: ../midori/midori-panel.c:581 +msgid "Align sidepanel to the left" +msgstr "Aliñar o panel lateral á esquerda" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 -msgid "Homepage" -msgstr "Inicio" +#: ../midori/midori-panel.c:704 +msgid "Show panel _titles" +msgstr "Mostrar os _títulos dos paneis" -#: ../midori/midori-websettings.c:133 -msgid "Last open pages" -msgstr "Páxinas abertas recentemente" +#: ../midori/midori-panel.c:712 +msgid "Show operating _controls" +msgstr "Mostrar os _controis de operación" -#: ../midori/midori-websettings.c:148 -msgid "Chinese (BIG5)" -msgstr "Chinés (BIG5)" +#: ../midori/midori-panel.c:783 +msgid "Options" +msgstr "Opcións" -#: ../midori/midori-websettings.c:149 -msgid "Japanese (SHIFT_JIS)" -msgstr "Xaponés (SHIFT_JIS)" +#: ../midori/midori-websettings.c:197 +msgid "Show Blank page" +msgstr "Mostrar unha páxina en branco" -#: ../midori/midori-websettings.c:150 -msgid "Russian (KOI8-R)" -msgstr "Ruso (KOI8-R)" +#: ../midori/midori-websettings.c:198 +msgid "Show Homepage" +msgstr "Mostrar a páxina inicial" -#: ../midori/midori-websettings.c:151 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:152 -msgid "Western (ISO-8859-1)" -msgstr "Occidental (ISO-8859-1)" +#: ../midori/midori-websettings.c:199 +msgid "Show last open tabs" +msgstr "Mostrar as últimas lingüetas abertas" -#: ../midori/midori-websettings.c:153 -msgid "Custom..." -msgstr "Personalizado..." +#: ../midori/midori-websettings.c:215 +msgid "Japanese (SHIFT_JIS)" +msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:234 msgid "New tab" msgstr "Nova lingüeta" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:235 msgid "New window" -msgstr "Nova ventá" +msgstr "Nova xanela" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:236 msgid "Current tab" msgstr "Lingüeta actual" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:251 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:252 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:253 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:188 -msgid "Both" -msgstr "Ambos" +#: ../midori/midori-websettings.c:254 +msgid "Icons and text" +msgstr "Iconas e texto" -#: ../midori/midori-websettings.c:189 -msgid "Both horizontal" -msgstr "Ambos en horizontal" +#: ../midori/midori-websettings.c:255 +msgid "Text beside icons" +msgstr "Texto a carón das iconas" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:270 msgid "All cookies" -msgstr "Todas as «cookies»" +msgstr "Todas as cookies" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:271 msgid "Session cookies" -msgstr "As «cookies» de esta sesión" +msgstr "As cookies desta sesión" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:272 +#: ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:93 msgid "None" msgstr "Ningunha" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:288 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:289 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:290 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:343 msgid "Remember last window size" -msgstr "Recordar último tamaño de ventá" +msgstr "Lembrar o último tamaño de xanela" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:344 msgid "Whether to save the last window size" -msgstr "Gardar (ou non) o último tamaño de ventá" +msgstr "Gardar (ou non) o último tamaño de xanela" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:352 msgid "Last window width" -msgstr "Última largura da ventá" +msgstr "Última largura da xanela" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:353 msgid "The last saved window width" -msgstr "Última largura da ventá gardada" +msgstr "Última largura da xanela gardada" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:361 msgid "Last window height" -msgstr "Última altura da ventá" +msgstr "Última altura da xanela" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:362 msgid "The last saved window height" -msgstr "Última altura da ventá gardada" +msgstr "Última altura da xanela gardada" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:387 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel position" -msgstr "Uñtima posición gardada do panel" +msgstr "Última posición gardada do panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:397 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:398 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:406 msgid "Last Web search" msgstr "Última busca na web" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:407 msgid "The last saved Web search" msgstr "Última busca na web gardada" -#: ../midori/midori-websettings.c:302 -#, fuzzy +#: ../midori/midori-websettings.c:416 msgid "Show Menubar" -msgstr "Barra do menú" +msgstr "Mostrar a barra de menú" -#: ../midori/midori-websettings.c:303 -#, fuzzy +#: ../midori/midori-websettings.c:417 msgid "Whether to show the menubar" -msgstr "Amosar (ou non) a barra de estado" +msgstr "Mostrar (ou non) a barra de menú" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:425 msgid "Show Navigationbar" -msgstr "Amosar a barra de navegación" +msgstr "Mostrar a barra de navegación" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the navigationbar" -msgstr "Amosar (ou non) a barra de navegación" +msgstr "Mostrar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:434 msgid "Show Bookmarkbar" -msgstr "Amosar a barra de marcapáxinas" +msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:435 msgid "Whether to show the bookmarkbar" -msgstr "Amosar (ou non) a barra de marcapáxinas" +msgstr "Mostrar (ou non) a barra de marcadores" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:443 msgid "Show Panel" -msgstr "Amosar o panel" +msgstr "Mostrar o panel" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" -msgstr "Amosar (ou non) o panel" +msgstr "Mostrar (ou non) o panel" + +#: ../midori/midori-websettings.c:459 +msgid "Show Transferbar" +msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:460 +msgid "Whether to show the transferbar" +msgstr "Mostrar (ou non) a barra de transferencias" + +#: ../midori/midori-websettings.c:468 msgid "Show Statusbar" -msgstr "Amosar a barra de estado" +msgstr "Mostrar a barra de estado" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:469 msgid "Whether to show the statusbar" -msgstr "Amosar (ou non) a barra de estado" +msgstr "Mostrar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:348 -msgid "Toolbar Style" -msgstr "Estilo da barra de ferramentas" +#: ../midori/midori-websettings.c:478 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:479 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:358 -#, fuzzy +#: ../midori/midori-websettings.c:495 +msgid "Show progress in location entry" +msgstr "Mostrar o progreso da carga na barra de navegación" + +#: ../midori/midori-websettings.c:496 +msgid "Whether to show loading progress in the location entry" +msgstr "Mostrar o progreso da carga (ou non) na barra de navegación" + +#: ../midori/midori-websettings.c:511 +msgid "Search engines in location completion" +msgstr "Motor de busca na barra de navegación" + +#: ../midori/midori-websettings.c:512 +msgid "Whether to show search engines in the location completion" +msgstr "Mostrar (ou non) o motor de busca na barra de navegación" + +#: ../midori/midori-websettings.c:520 msgid "Toolbar Items" -msgstr "Estilo da barra de ferramentas" +msgstr "Elementos da barra de ferramentas" -#: ../midori/midori-websettings.c:359 -#, fuzzy +#: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" -msgstr "O estilo da barra de ferramentas" +msgstr "Elementos que se van mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:367 -#, fuzzy +#: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" -msgstr "_Panel lateral" +msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:368 -#, fuzzy +#: ../midori/midori-websettings.c:530 msgid "Whether to make the sidepanel compact" -msgstr "Amosar (ou non) o panel" +msgstr "Facer (ou non) o panel lateral compacto" -#: ../midori/midori-websettings.c:377 -msgid "Load on Startup" -msgstr "Cargar ao inicio" +#: ../midori/midori-websettings.c:545 +msgid "Show operating controls of the panel" +msgstr "Mostrar os controis de operación do panel" -#: ../midori/midori-websettings.c:378 -msgid "What to load on startup" -msgstr "Que cargar no inicio" +#: ../midori/midori-websettings.c:546 +msgid "Whether to show the operating controls of the panel" +msgstr "Mostrar (ou non) os controis de operación do panel" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:561 +msgid "Align sidepanel on the right" +msgstr "Aliñar á dereita o panel lateral" + +#: ../midori/midori-websettings.c:562 +msgid "Whether to align the sidepanel on the right" +msgstr "Aliñar (ou non) á dereita o panel lateral" + +#: ../midori/midori-websettings.c:571 +msgid "When Midori starts:" +msgstr "Cando se inicia Midori:" + +#: ../midori/midori-websettings.c:572 +msgid "What to do when Midori starts" +msgstr "Que facer ao iniciar Midori" + +#: ../midori/midori-websettings.c:581 +msgid "Homepage:" +msgstr "Páxina de inicio:" + +#: ../midori/midori-websettings.c:582 msgid "The homepage" -msgstr "Páxina de inicio" +msgstr "A páxina de inicio" -#: ../midori/midori-websettings.c:396 -msgid "Download Folder" -msgstr "Cartafol de descargas" +#: ../midori/midori-websettings.c:597 +msgid "Show crash dialog" +msgstr "Mostrar o diálogo de fallo" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:598 +msgid "Show a dialog after Midori crashed" +msgstr "Mostrar un cadro de dialogo despois de que Midori falle" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:614 +msgid "Show speed dial in new tabs" +msgstr "Mostrar a marcación rápida nas novas lingüetas" + +#: ../midori/midori-websettings.c:615 +msgid "Show speed dial in newly opened tabs" +msgstr "Mostrar a marcación rápida nas novas lingüetas que se abran" + +#: ../midori/midori-websettings.c:623 +msgid "Save downloaded files to:" +msgstr "Gardar os ficheiros descargados en:" + +#: ../midori/midori-websettings.c:624 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:643 +msgid "Ask for the destination folder" +msgstr "Preguntar polo cartafol de destino" + +#: ../midori/midori-websettings.c:644 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" + +#: ../midori/midori-websettings.c:663 +msgid "Notify when a transfer has been completed" +msgstr "Notificar cando se complete unha transferencia" + +#: ../midori/midori-websettings.c:664 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" + +#: ../midori/midori-websettings.c:676 msgid "Download Manager" msgstr "Xestor de descargas" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:677 msgid "An external download manager" msgstr "Xestor de descargas externo" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:685 msgid "Text Editor" -msgstr "" +msgstr "Editor de texto" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:686 msgid "An external text editor" -msgstr "" +msgstr "Un editor de texto externo" + +#: ../midori/midori-websettings.c:701 +msgid "News Aggregator" +msgstr "Agregador de novas" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:702 +msgid "An external news aggregator" +msgstr "Un agregador de novas externo" + +#: ../midori/midori-websettings.c:710 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:711 msgid "The search to perform inside the location entry" msgstr "Facer unha busca a partir do contido da barra de enderezos" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:719 msgid "Preferred Encoding" -msgstr "Codificación prefereida" +msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:720 msgid "The preferred character encoding" msgstr "Codificación de carácteres preferida" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:730 msgid "Always Show Tabbar" -msgstr "" +msgstr "Mostrar sempre a barra de lingüetas" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:731 msgid "Always show the tabbar" -msgstr "" +msgstr "Mostrar sempre a barra de lingüetas" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:739 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lingüetas" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:740 msgid "Whether tabs have close buttons" msgstr "Cada unha das lingüetas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:462 -msgid "Open new pages in" -msgstr "Abrir as páxinas novas en" +#: ../midori/midori-websettings.c:748 +msgid "Open new pages in:" +msgstr "Abrir as páxinas novas en:" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:749 msgid "Where to open new pages" -msgstr "Donde se van a abrir as páxinas novas" +msgstr "Onde se van abrir as páxinas novas" -#: ../midori/midori-websettings.c:473 -#, fuzzy -msgid "Open external pages in" -msgstr "Abrir as páxinas novas en" +#: ../midori/midori-websettings.c:758 +msgid "Open external pages in:" +msgstr "Abrir as páxinas externas en:" -#: ../midori/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:759 msgid "Where to open externally opened pages" -msgstr "Donde se van a abrir as páxinas novas" +msgstr "Onde se van abrir as páxinas abertas dende o exterior" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:768 msgid "Middle click opens Selection" -msgstr "Clic no botón do medio abre a selección" +msgstr "Prema no botón central para abrir a selección" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Cargar unha URL na selección empregando o botón de medio do rato" +#: ../midori/midori-websettings.c:769 +msgid "Load an address from the selection via middle click" +msgstr "Cargue un enderezo da selección premendo no botón central do rato" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:777 msgid "Open tabs in the background" -msgstr "Abrir lingüetas en segundo plano" +msgstr "Abrir as lingüetas en segundo plano" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:778 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lingüetas en segundo plano" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Abrir lingüetas xunto á actual" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:787 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Abrir as novas lingüetas xunto á lingüeta actual ou despois da última" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:795 msgid "Open popups in tabs" msgstr "Abrir «emerxentes» en lingüetas" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:796 msgid "Whether to open popup windows in tabs" -msgstr "Abrir (ou non) as ventas emerxentes en lingüetas" +msgstr "Abrir (ou non) as xanelas emerxentes en lingüetas" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:812 +msgid "Zoom Text and Images" +msgstr "Zoom sobre o texto e imaxes" + +#: ../midori/midori-websettings.c:813 +msgid "Whether to zoom text and images" +msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" + +#: ../midori/midori-websettings.c:828 +msgid "Find inline while typing" +msgstr "Buscar en liña ao escribir" + +#: ../midori/midori-websettings.c:829 +msgid "Whether to automatically find inline while typing" +msgstr "Buscar en liña automaticamente (ou non) mentres se escribe" + +#: ../midori/midori-websettings.c:837 msgid "Accept cookies" msgstr "Aceptar as «cookies»" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:838 msgid "What type of cookies to accept" -msgstr "Que tipos de «cookies» van ser aceptadas" +msgstr "Que tipos de «cookies» se van aceptar" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:847 msgid "Original cookies only" msgstr "Só as «cookies» do sitio orixinal" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:848 msgid "Accept cookies from the original website only" msgstr "Só se aceptan as «cookies» do sitio orixe" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:856 msgid "Maximum cookie age" msgstr "Persistencia máxima das «cookies»" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:857 msgid "The maximum number of days to save cookies for" -msgstr "Tempo máximo, en dias, durante os que se gardaran as «cookies»" +msgstr "Tempo máximo, en días, durante os que se gardaran as «cookies»" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" -msgstr "Recordar as últimas páxinas visitadas" +msgstr "Lembrar as últimas páxinas visitadas" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:868 msgid "Whether the last visited pages are saved" -msgstr "Recordar (ou non) as últimas páxinas que foron visitadas" +msgstr "Lembrar (ou non) as últimas páxinas que se visitaron" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:876 msgid "Maximum history age" -msgstr "Persistencia máxima do histórico" +msgstr "Persistencia máxima do historial" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" -msgstr "Tempo máximo, en dias, durante os que se gardará un dato do histórico" +msgstr "Tempo máximo, en días, durante os que se gardará un dato do historial" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:885 msgid "Remember last form inputs" -msgstr "Recordar as últimas sesións de formularios" +msgstr "Lembrar as últimas sesións de formularios" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:886 msgid "Whether the last form inputs are saved" -msgstr "Recordar (ou non) as últimas sesións cos seus datos de formularios" +msgstr "Lembrar (ou non) as últimas sesións cos seus datos de formularios" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:894 msgid "Remember last downloaded files" -msgstr "Recordar últimos ficheiros descargados" +msgstr "Lembrar os últimos ficheiros descargados" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:895 msgid "Whether the last downloaded files are saved" -msgstr "" -"Recordar (ou non) a lista de descargas de ficheiros realizadas últimamente" +msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "Servidor proxy HTTP" +#: ../midori/midori-websettings.c:905 +msgid "Proxy Server" +msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "Servidor proxy para conexións HTTP" +#: ../midori/midori-websettings.c:906 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy que se usa para as conexións HTTP" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:921 +msgid "Detect proxy server automatically" +msgstr "Detectar o servidor proxy automaticamente" + +#: ../midori/midori-websettings.c:922 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:938 +msgid "Identify as" +msgstr "Identificarse como" + +#: ../midori/midori-websettings.c:939 +msgid "What to identify as to web pages" +msgstr "Como se identifica nas páxinas web" + +#: ../midori/midori-websettings.c:955 +msgid "Identification string" +msgstr "Cadea de identificación" + +#: ../midori/midori-websettings.c:956 +msgid "The application identification string" +msgstr "Cadea de identificación do aplicativo" + +#: ../midori/midori-websettings.c:964 msgid "Cache size" msgstr "Tamaño da caché" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:965 msgid "The allowed size of the cache" msgstr "Tamaño asignado á memoria caché" +#: ../midori/midori-websettings.c:980 +msgid "Clear private data" +msgstr "Limpar a información persoal" + +#: ../midori/midori-websettings.c:981 +msgid "The private data selected for deletion" +msgstr "Os datos privados seleccionados para eliminar" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:782 +#: ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:3047 +#, c-format +msgid "Error - %s" +msgstr "Erro - %s" + +#: ../midori/midori-view.c:783 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Non se puido cargar a páxina «%s»." + +#: ../midori/midori-view.c:788 +msgid "Try again" +msgstr "Inténteo de novo" + #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:821 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Non se atopou - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:1218 +msgid "Open _Link" +msgstr "Abrir unha _ligazón" + +#: ../midori/midori-view.c:1220 msgid "Open Link in New _Tab" -msgstr "Abrir a ligazón nunha nova _lingüeta" +msgstr "Abrir a ligazón nunha nova lingüe_ta" -#: ../midori/midori-view.c:925 -msgid "_Save Link destination" -msgstr "" +#: ../midori/midori-view.c:1237 +msgid "Open Link in New _Window" +msgstr "Abrir a ligazón nunha _xanela nova" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1243 msgid "_Download Link destination" -msgstr "" +msgstr "_Descargar ligazón de destino" + +#: ../midori/midori-view.c:1249 +msgid "_Save Link destination" +msgstr "_Gardar ligazón de destino" + +#: ../midori/midori-view.c:1258 +msgid "Download with Download _Manager" +msgstr "Descargar co _Xestor de descargas" + +#: ../midori/midori-view.c:1287 +msgid "Search _with" +msgstr "Buscar _con: " + +#: ../midori/midori-view.c:1319 +msgid "_Search the Web" +msgstr "_Buscar na rede" + +#: ../midori/midori-view.c:1329 +msgid "Open Address in New _Tab" +msgstr "Abrir o enderezo nunha nova lingüe_ta" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Abrir a URL nunha nova _lingüeta" +#: ../midori/midori-view.c:1507 +msgid "Open or download file" +msgstr "Abrir ou descargar o ficheiro" + +#: ../midori/midori-view.c:1524 +#, c-format +msgid "File Type: '%s'" +msgstr "Tipo de ficheiro: «%s»" + +#: ../midori/midori-view.c:1527 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tipo de ficheiro: %s («%s»)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1531 +#, c-format +msgid "Open %s" +msgstr "Abrir %s" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1981 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Inspeccionar a páxina - %s" -#: ../midori/midori-view.c:1503 -msgid "Source" -msgstr "Código fonte" +#: ../midori/midori-view.c:2176 +msgid "Speed dial" +msgstr "Marcación rápida" -#: ../midori/midori-view.c:1527 -#, fuzzy, c-format +#: ../midori/midori-view.c:2177 +msgid "Click to add a shortcut" +msgstr "Prema para engadir un atallo" + +#: ../midori/midori-view.c:2178 +msgid "Enter shortcut address" +msgstr "Introduza o enderezo do atallo" + +#: ../midori/midori-view.c:2179 +msgid "Enter shortcut title" +msgstr "Introduza o título do atallo" + +#: ../midori/midori-view.c:2180 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Está seguro de que desexa eliminar este atallo?" + +#: ../midori/midori-view.c:2210 +#, c-format +msgid "Document cannot be displayed" +msgstr "Non se pode mostrar o documento" + +#: ../midori/midori-view.c:2227 +#, c-format msgid "No documentation installed" -msgstr "Amosar a documentación" +msgstr "A documentación non está instalada" + +#: ../midori/midori-view.c:2352 +msgid "Blank page" +msgstr "Páxina en branco" + +#: ../midori/midori-view.c:2581 +#: ../midori/sokoke.c:870 +msgid "New _Tab" +msgstr "Nova lingüe_ta" + +#: ../midori/midori-view.c:2595 +msgid "_Duplicate Tab" +msgstr "_Duplicar a lingüeta" -#: ../midori/midori-preferences.c:87 -#, fuzzy, c-format +#: ../midori/midori-view.c:2600 +msgid "_Restore Tab" +msgstr "_Restaurar a lingüeta" + +#: ../midori/midori-view.c:2600 +msgid "_Minimize Tab" +msgstr "_Minimizar a lingüeta" + +#: ../midori/midori-view.c:3149 +msgid "Print background images" +msgstr "Imprimir imaxes de fondo" + +#: ../midori/midori-view.c:3150 +msgid "Whether background images should be printed" +msgstr "Se se imprimen (ou non) as imaxes de fondo" + +#: ../midori/midori-view.c:3194 +#: ../midori/midori-preferences.c:484 +msgid "Features" +msgstr "Funcionalidades" + +#: ../midori/midori-preferences.c:91 +#, c-format msgid "Preferences for %s" -msgstr "%s Preferencias" +msgstr "Preferencias de %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Xeral" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Inicio" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Usar a páxina actual como páxina de inicio" + +#: ../midori/midori-preferences.c:425 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transferencias" + #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Aparencia" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:441 msgid "Font settings" -msgstr "Axustes de fontes" +msgstr "Axustes de tipo de letra" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" -msgstr "" +msgstr "Tipo de letra predeterminado" + +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Tipo de letra predeterminado utilizada para mostrar o texto" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "Tamaño predeterminado do tipo de letra usado para mostrar o texto" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Tipo de letra de ancho fixo" + +#: ../midori/midori-preferences.c:457 +msgid "The font family used to display fixed-width text" +msgstr "Tipo de letra que se usa para mostrar texto de ancho fixo" + +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "O tamaño do tipo de letra que se usa para mostrar texto de ancho fixo" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" -msgstr "" +msgstr "Tamaño mínimo do tipo de letra" + +#: ../midori/midori-preferences.c:466 +msgid "The minimum font size used to display text" +msgstr "Tamaño mínimo do tipo de letra para mostrar texto" + +#: ../midori/midori-preferences.c:473 +msgid "Encoding" +msgstr "Codificación" + +#: ../midori/midori-preferences.c:476 +msgid "The character encoding to use by default" +msgstr "Codificación de caracteres prefedeterminada" #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:408 -msgid "Features" -msgstr "Funcionalidades" - -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:487 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" -msgstr "" +msgstr "Cargar as imaxes automaticamente" -#: ../midori/midori-preferences.c:414 -msgid "Shrink images automatically" -msgstr "" +#: ../midori/midori-preferences.c:488 +msgid "Load and display images automatically" +msgstr "Cargar e mostrar as imaxes automaticamente" -#: ../midori/midori-preferences.c:417 -msgid "Print background images" -msgstr "" +#: ../midori/midori-preferences.c:492 +msgid "Shrink images automatically" +msgstr "Reducir as imaxes automaticamente" -#: ../midori/midori-preferences.c:420 -msgid "Resizable text areas" -msgstr "" +#: ../midori/midori-preferences.c:493 +msgid "Automatically shrink standalone images to fit" +msgstr "Redimensionar as imaxes automaticamente para axustalas" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 -#, fuzzy +#: ../midori/midori-preferences.c:499 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" -msgstr "Scripts de usuario" +msgstr "Activar scripts" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 -msgid "Enable plugins" -msgstr "" +#: ../midori/midori-preferences.c:500 +msgid "Enable embedded scripting languages" +msgstr "Activar linguaxes de scripting incrustadas" + +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Activar os engadidos de Netscape" + +#: ../midori/midori-preferences.c:504 +msgid "Enable embedded Netscape plugin objects" +msgstr "Activar o engadido de obxectos incrustados de Netscape" + +#: ../midori/midori-preferences.c:507 +msgid "Enforce 96 dots per inch" +msgstr "Aplicar 96 puntos por polgada" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:508 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP" + +#: ../midori/midori-preferences.c:511 msgid "Enable developer tools" -msgstr "" +msgstr "Activar ferramentas de desenvolvedor" + +#: ../midori/midori-preferences.c:512 +msgid "Enable special extensions for developers" +msgstr "Activar as extensións especiais para desenvolvedores" + +#: ../midori/midori-preferences.c:519 +msgid "Spell Checking" +msgstr "Corrección ortográfica" + +#: ../midori/midori-preferences.c:522 +msgid "Enable Spell Checking" +msgstr "Activar a corrección ortográfica" + +#: ../midori/midori-preferences.c:523 +msgid "Enable spell checking while typing" +msgstr "Activar o corrector ortográfico ao escribir" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:527 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Lista de idiomas, separados por comas, a empregar para a corrección ortográfica, p.ex. «en_GB,de_DE»" #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:532 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:533 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:544 msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#. Page "Applications" +#: ../midori/midori-preferences.c:568 +msgid "Applications" +msgstr "Aplicativos" + +#: ../midori/midori-preferences.c:569 +msgid "External applications" +msgstr "Aplicativos externos" + +#. Page "Network" +#: ../midori/midori-preferences.c:615 +#: ../midori/midori-preferences.c:616 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:643 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:648 msgid "Privacy" -msgstr "" +msgstr "Privacidade" -#: ../midori/midori-preferences.c:500 -#, fuzzy +#: ../midori/midori-preferences.c:649 msgid "Web Cookies" -msgstr "Aceptar as «cookies»" +msgstr "Cookies" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:662 +#: ../midori/midori-preferences.c:672 msgid "days" -msgstr "" +msgstr "días" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:488 +#: ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "Baleiro" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Engadir un motor de busca" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Editar o motor de busca" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:869 -msgid "_Icon (name or file):" -msgstr "_Icona (nome ou ficheiro):" +#: ../midori/midori-searchaction.c:980 +msgid "_Icon:" +msgstr "_Icona" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:994 msgid "_Token:" msgstr "«_Marca»" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" +#: ../midori/midori-searchaction.c:1213 +msgid "Manage Search Engines" msgstr "Xestionar os motores de busca" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/midori-searchaction.c:1312 +msgid "Use as _default" +msgstr "Usar como pre_determinado" + +#: ../midori/sokoke.c:166 +#: ../midori/sokoke.c:178 msgid "Could not run external program." msgstr "Non se puido executar o programa externo." -#: ../midori/sokoke.c:282 -msgid "Warning: You are using a superuser account!" -msgstr "Aviso: Estas conectado como super usuario!" +#: ../midori/sokoke.c:861 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Atopouse un erro descoñecido:" +#: ../midori/sokoke.c:863 +msgid "Add Boo_kmark" +msgstr "Engadir mar_cador…" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s non ten a propiedade «%s»" +#: ../midori/sokoke.c:864 +msgid "_Console" +msgstr "_Consola" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s non pode ser asignado a %s.%s" +#: ../midori/sokoke.c:865 +msgid "_Extensions" +msgstr "_Extensións" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s non se pode acceder" +#: ../midori/sokoke.c:866 +msgid "_History" +msgstr "_Historial" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../midori/sokoke.c:867 +msgid "_Homepage" +msgstr "P_áxina de inicio" + +#: ../midori/sokoke.c:868 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/sokoke.c:869 +msgid "User_styles" +msgstr "_Estilos de usuario" + +#: ../midori/sokoke.c:871 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/sokoke.c:872 +msgid "Netscape p_lugins" +msgstr "En_gadidos de Netscape" + +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "" +#: ../panels/midori-bookmarks.c:108 +msgid "Bookmarks" +msgstr "Marcadores" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 -#, fuzzy -msgid "_Disable" -msgstr "_Ficheiro" +#: ../panels/midori-bookmarks.c:239 +msgid "Edit the selected bookmark" +msgstr "Editar o marcador seleccionado" + +#: ../panels/midori-bookmarks.c:247 +msgid "Delete the selected bookmark" +msgstr "Borrar o marcador seleccionado" + +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Engadir un cartafol novo" + +#: ../panels/midori-bookmarks.c:592 +msgid "Separator" +msgstr "Separador" #: ../panels/midori-console.c:87 msgid "Console" msgstr "Consola" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensións" -#: ../katze/katze-throbber.c:828 -#, c-format -msgid "Named icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:841 -#, c-format -msgid "Stock icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:907 -msgid "Animation frames are broken" -msgstr "" - -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "A propiedade «%s» non é válida para %s" - -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 -msgid "Choose file" -msgstr "Escoller un ficheiro" - -#: ../katze/katze-utils.c:198 -msgid "Choose folder" -msgstr "Escoller un cartafol" +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Esta seguro de que desexa eliminar tódolos elementos do historial?" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 -msgid "Pageholder" -msgstr "Cadro de páxinas" +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Por en marcadores o elemento seleccionado no historial" -#: ../extensions/page-holder.c:128 -msgid "_Pageholder" -msgstr "C_adro de páxinas" +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Borrar o elemento seleccionado no historial" -#: ../extensions/statusbar-features.c:30 -msgid "Images" -msgstr "" +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Limpar completamente o historial" -#: ../extensions/statusbar-features.c:37 -#, fuzzy -msgid "Scripts" -msgstr "Scripts de usuario" +#: ../panels/midori-history.c:601 +msgid "A week ago" +msgstr "Fai unha semana" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "" +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "Fai %d día" +msgstr[1] "Fai %d días" -#~ msgid "Select _All" -#~ msgstr "Seleccion_ar todo" +#: ../panels/midori-history.c:614 +msgid "Today" +msgstr "Hoxe" -#~ msgid "_Fullscreen" -#~ msgstr "_Pantalla completa" +#: ../panels/midori-history.c:616 +msgid "Yesterday" +msgstr "Onte" -#~ msgid "_Leave Fullscreen" -#~ msgstr "_Saír de pantalla completa" +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Engadidos de Netscape" -#~ msgid "Unknown argument." -#~ msgstr "Argumento descoñecido." +#: ../panels/midori-transfers.c:480 +msgid "Open Destination _Folder" +msgstr "Abrir o carta_fol de destino" -#~ msgid "Failed to setup interface." -#~ msgstr "Fallou a configuración da interface." +#: ../panels/midori-transfers.c:483 +msgid "Copy Link Loc_ation" +msgstr "Copiar o enderezo da lig_azón" -#~ msgid "Settings" -#~ msgstr "Configuración" +#: ../katze/katze-http-auth.c:124 +msgid "Authentication Required" +msgstr "Precísase autenticación" -#~ msgid "The associated settings" -#~ msgstr "Axustes asociados" +#: ../katze/katze-http-auth.c:140 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Precísanse un nome de usuario e un\n" +"contrasinal para abrir esta localización:" -#~ msgid "Trash" -#~ msgstr "Cesta do lixo" +#: ../katze/katze-http-auth.c:154 +msgid "Username" +msgstr "Usuario" -#~ msgid "The trash, collecting recently closed tabs and windows" -#~ msgstr "Lixo, recollido recentemente pechando lingüetas e ventás" +#: ../katze/katze-http-auth.c:170 +msgid "Password" +msgstr "Contrasinal" -#~ msgid "Browser" -#~ msgstr "Navegador" +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Non se puido cargar a icona chamada «%s»" -#~ msgid "The current browser" -#~ msgstr "Navegador actual" +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "A icona de inventario «%s» non se pode cargar" -#~ msgid "Browser Count" -#~ msgstr "Contador do navegador" +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Os marcos de animación están rotos" -#~ msgid "The current number of browsers" -#~ msgstr "Número actual de navegadores" +#: ../katze/katze-utils.c:200 +#: ../katze/katze-utils.c:407 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "A propiedade «%s» non é válida para %s" -#~ msgid "Search Engines" -#~ msgstr "Motores de busca" +#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:264 +msgid "Choose file" +msgstr "Escoller un ficheiro" -#~ msgid "The list of search engines" -#~ msgstr "Lista de motores de busca" +#: ../katze/katze-utils.c:250 +msgid "Choose folder" +msgstr "Escoller un cartafol" -#~ msgid "The navigationbar" -#~ msgstr "Barra de navegación" +#: ../extensions/adblock.c:167 +msgid "Configure Advertisement filters" +msgstr "Configurar os filtros de publicidade" -#~ msgid "Tab" -#~ msgstr "Lingüeta" +#: ../extensions/adblock.c:304 +msgid "Configure _Advertisement filters..." +msgstr "Configurar os filtros de _publicidade..." -#~ msgid "The current tab" -#~ msgstr "Lingüeta actual" +#: ../extensions/adblock.c:565 +msgid "Advertisement blocker" +msgstr "Bloqueo de publicidade" -#~ msgid "Statusbar" -#~ msgstr "Barra de estado" +#: ../extensions/adblock.c:566 +msgid "Block advertisements according to a filter list" +msgstr "Bloquear a publicidade de acordo cunha lista de filtros" -#~ msgid "The statusbar" -#~ msgstr "Barra de estado" +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Pintar as lingüetas con cores diferentes" -#~ msgid "Statusbar Text" -#~ msgstr "Texto da barra de estado" +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Lingüetas de cores" -#~ msgid "The text that is displayed in the statusbar" -#~ msgstr "O texto amosase na barra de estado" +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Colorea cada lingüeta para distinguilas" -#~ msgid "The list of search engines to be used for web search" -#~ msgstr "Lista de motores de busca que pode utilizar para buscas na web" +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Xestor de cookies" -#~ msgid "Pa_ge Setup" -#~ msgstr "Configuración da páxina" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Borrar todo" -#~ msgid "Show a preview of the printed page" -#~ msgstr "Amosar previsualización da páxina á imprimir" +#: ../extensions/cookie-manager/cookie-manager-page.c:111 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Elimina todas as cookies mostradas. Se se define un filtro, só se eliminarán as cookies que coincidan co filtro." -#~ msgid "Undo the last modification" -#~ msgstr "Desfacer a última modificación" +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Expandir todo" -#~ msgid "Redo the last modification" -#~ msgstr "Refacer a última modificación" +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "Contraer todo" -#~ msgid "Open in Page_holder..." -#~ msgstr "Abrir no _cadro de páxinas" +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "Está seguro de que desexa borrar todas as cookies?" -#~ msgid "Open the current page in the pageholder" -#~ msgstr "Abrir a páxina actual no cadro de páxinas" +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Pregunta" -#~ msgid "_Manage Bookmarks" -#~ msgstr "_Xestionar marcapáxinas" +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "Só se borrarán as cookies que coincidan co filtro." -#~ msgid "Add, edit and remove bookmarks..." -#~ msgstr "Engadir, editar ou eliminar marcapáxinas..." +#: ../extensions/cookie-manager/cookie-manager-page.c:539 +msgid "At the end of the session" +msgstr "Na fin da sesión" -#~ msgid "Open the selected bookmark in a new tab" -#~ msgstr "Abrir o marcapáxinas seleccionado nunha lingüeta nova" +#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Servidor: %s\n" +"Nome: %s\n" +"Valor: %s\n" +"Ruta: %s\n" +"Segura: %s\n" +"Caduca: %s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "Yes" +msgstr "Si" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "No" +msgstr "Non" + +#: ../extensions/cookie-manager/cookie-manager-page.c:811 +msgid "Name" +msgstr "Nome" + +#: ../extensions/cookie-manager/cookie-manager-page.c:862 +msgid "_Expand All" +msgstr "_Expandir todo" + +#: ../extensions/cookie-manager/cookie-manager-page.c:870 +msgid "_Collapse All" +msgstr "_Contraer todo" + +#: ../extensions/cookie-manager/cookie-manager-page.c:923 +msgid "Filter:" +msgstr " Filtro:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduza unha cadea como filtro para mostrar só as cookies cuxo nome ou campo de dominio coincida co filtro de entrada" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "Xestor de _cookies" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Listar, ver e borrar cookies" + +#: ../extensions/feed-panel/feed-atom.c:237 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Non se puideron atopar os elementos necesarios Atom «entry» nos datos XML." + +#: ../extensions/feed-panel/feed-atom.c:343 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Non se puideron atopar os elementos necesarios Atom «feed» nos datos XML." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Última actualización: %s." -#~ msgid "Open the selected bookmark in a new window" -#~ msgstr "Abrir o marcapáxinas seleccionado nunha ventá nova" +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Fontes" -# comprobar -#~ msgid "Tab _Overview" -#~ msgstr "_Descrición de lingüetas" +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Engadir unha nova fonte" -#~ msgid "_Work Offline" -#~ msgstr "Traballar desconectado" +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Borrar fonte" -#~ msgid "Work without a network connection" -#~ msgstr "Traballar sin conexión de rede" +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Fontes" -#~ msgid "Appearance of the shadow around each panel" -#~ msgstr "Aspecto das sombras arredor de cada panel" +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Non se puido atopar o elemento raíz nos datos XML da fonte." -#~ msgid "Menu" -#~ msgstr "Menú" +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "Formato de fonte non soportado." -#~ msgid "Menu to hold panel items" -#~ msgstr "Menu para conter os elementos dos paneis" +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Non se puido analizar a fonte XML: %s" -#~ msgid "The index of the current page" -#~ msgstr "Indice da páxina actual" +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Non se puido atopar o elemento «channel» nos datos XML do RSS." -#~ msgid "Last pageholder URI" -#~ msgstr "Última URI do cadro de páxinas" +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Versión de RSS non soportada." -#~ msgid "The URI last opened in the pageholder" -#~ msgstr "Última URI aberta no cadro de páxinas" +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Non se puidieron atopar os elementos necesarios RSS «item» nos datos XML." -#~ msgid "Show New Tab" -#~ msgstr "Amosar nova lingüeta" +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Non se puideron atopar os elementos necesarios RSS «channel» nos datos XML." -#~ msgid "Show the New Tab button in the toolbar" -#~ msgstr "Amosar o botón de «Nova lingüeta» na barra de ferramentas" +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Erro" -#~ msgid "Show Homepage" -#~ msgstr "Amosar páxina de inicio" +#: ../extensions/feed-panel/main.c:126 +#, c-format +msgid "Feed '%s' already exists" +msgstr "A fonte «%s» xa existe" -#~ msgid "Show the Homepage button in the toolbar" -#~ msgstr "Amosar o botón de «Páxina de Inicio» na barra de ferramentas" +#: ../extensions/feed-panel/main.c:203 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Atopouse un erro ao cargar a fonte «%s»" -#~ msgid "Show Web search" -#~ msgstr "Amosar o buscador web" +#: ../extensions/feed-panel/main.c:514 +msgid "Feed Panel" +msgstr "Panel de fontes" -#~ msgid "Show the Web search entry in the toolbar" -#~ msgstr "Amosar a caixa se buscas na web na barra de ferramentas" +#: ../extensions/feed-panel/main.c:515 +msgid "Read Atom/ RSS feeds" +msgstr "Lector de fontes Atom/RSS" -#~ msgid "Show Trash" -#~ msgstr "Amosar «Cesta do lixo»" +#: ../extensions/mouse-gestures/main.c:236 +msgid "Mouse Gestures" +msgstr "Xestos do rato" -#~ msgid "Show the Trash button in the toolbar" -#~ msgstr "Amosar o botón «Cesta do lixo» na barra de ferramentas" +#: ../extensions/mouse-gestures/main.c:237 +msgid "Control Midori by moving the mouse" +msgstr "Controlar Midori con movementos do rato" -#~ msgid "Tab Label Size" -#~ msgstr "Tamaño da etiqueta de lingüetas" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Cadro de páxinas" -#~ msgid "The desired tab label size" -#~ msgstr "Tamaño desexado da etiqueta das lingüetas" +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "Cadro de _páxinas" -#~ msgid "The URI of the currently loaded page" -#~ msgstr "URI da páxina actualmente cargada" +#: ../extensions/shortcuts.c:172 +msgid "Customize Keyboard shortcuts" +msgstr "Personalizar os atallos de teclado" -#~ msgid "The title of the currently loaded page" -#~ msgstr "Título da páxina actualmente cargada" +#: ../extensions/shortcuts.c:264 +msgid "Customize Sh_ortcuts..." +msgstr "Personalizar _os atallos..." -#~ msgid "Download Link with Download _Manager" -#~ msgstr "Descargar a ligazón con un _xestor de descargas" +#: ../extensions/shortcuts.c:303 +msgid "Shortcuts" +msgstr "Atallos" -#~ msgid "Settings instance to provide properties" -#~ msgstr "Configuración exemplo para fornecer propiedades" +#: ../extensions/shortcuts.c:304 +msgid "View and edit keyboard shortcuts" +msgstr "Ver e modificar os atallos de teclado" -#~ msgid "Current Item" -#~ msgstr "Elemento actual" +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Imaxes" -#~ msgid "The currently selected item" -#~ msgstr "Elemento seleccionado actualmente" +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Scripts" -#~ msgid "Dialog" -#~ msgstr "Dialogo" +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "Características da barra de estado" -#~ msgid "A dialog to manage search engines" -#~ msgstr "Caixa de dialogo para xestionar os motores de busca" +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "Alternar facilmente as características dentro e fóra de páxinas web" -#~ msgid "Symbolic size to use for the animation" -#~ msgstr "Tamaño simbólico a usar para animacións" +#: ../extensions/tab-panel.c:558 +#: ../extensions/tab-panel.c:613 +msgid "Tab Panel" +msgstr "Panel de lingüetas" -#~ msgid "The name of an icon containing animation frames" -#~ msgstr "O nome da icona contén cadros animados" +#: ../extensions/tab-panel.c:597 +msgid "T_ab Panel" +msgstr "Panel de lingüe_tas" -#~ msgid "A GdkPixbuf containing animation frames" -#~ msgstr "O «GdkPixbuf» conten cadros de animación" +#: ../extensions/tab-panel.c:614 +msgid "Show tabs in a vertical panel" +msgstr "Mostrar as lingüetas nun panel vertical" -#~ msgid "Whether the throbber should be animated" -#~ msgstr "Animar (ou non) a icona" +#: ../extensions/toolbar-editor.c:391 +msgid "Customize Toolbar" +msgstr "Personalizar a barra de ferramentas" -#~ msgid "The name of an icon to be used as the static image" -#~ msgstr "Nome a usar para a icona non animada" +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Seleccionar os elementos que se van mostrar na barra de ferramentas. Os elementos poden reordenarse arrastrando e soltando." -#~ msgid "A GdkPixbuf to be used as the static image" -#~ msgstr "O «GdkPixbuf» vai ser usada como imaxe estática" +#: ../extensions/toolbar-editor.c:423 +msgid "Available Items" +msgstr "Elementos dispoñibles" -#~ msgid "The stock ID of an icon to be used as the static image" -#~ msgstr "ID da icona para ser usada como imaxe estática" +#: ../extensions/toolbar-editor.c:444 +msgid "Displayed Items" +msgstr "Elementos mostrados" -#~ msgid "Name" -#~ msgstr "Nome:" +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "Personalizar a barra de ferramen_tas..." -#~ msgid "Icon" -#~ msgstr "Icona" +#: ../extensions/toolbar-editor.c:611 +msgid "Toolbar Editor" +msgstr "Editor da barra de ferramentas" -#~ msgid "Token" -#~ msgstr "«Marca»" +#: ../extensions/toolbar-editor.c:612 +msgid "Easily edit the toolbar layout" +msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas" -#~ msgid "The token of the item" -#~ msgstr "«Marca» do elemento" diff --git a/po/he.po b/po/he.po index 95bd36d6..155f95bf 100644 --- a/po/he.po +++ b/po/he.po @@ -2,26 +2,31 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Shlomi Israel 2009 +# Mark Krapivner 2009 # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.5\n" +"Project-Id-Version: Midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-13 23:00+0200\n" -"PO-Revision-Date: 2009-04-13 12:14+0300\n" -"Last-Translator: Shlomi Israel \n" +"POT-Creation-Date: 2009-11-28 21:58+0100\n" +"PO-Revision-Date: 2009-11-28 23:34+0200\n" +"Last-Translator: Mark Krapivner \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "דפדפן קל משקל" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 -#: ../midori/main.c:1396 ../midori/main.c:1407 -#: ../midori/midori-websettings.c:269 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1479 +#: ../midori/main.c:1675 +#: ../midori/main.c:1683 +#: ../midori/main.c:1694 +#: ../midori/midori-websettings.c:290 msgid "Midori" msgstr "Midori" @@ -29,1628 +34,2059 @@ msgstr "Midori" msgid "Web Browser" msgstr "דפדפן" -#: ../midori/main.c:94 +#: ../midori/main.c:97 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "ההגדרות לא ניתנות לטעינה: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:152 #, c-format msgid "Value '%s' is invalid for %s" msgstr "הערך %s אינו תקף עבור %s" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:159 +#: ../midori/main.c:240 #, c-format msgid "Invalid configuration value '%s'" msgstr "ערך הגדרה אינו תקף '%s'" -#: ../midori/main.c:332 +#: ../midori/main.c:364 +#: ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" -msgstr "כשל בפתיחת מסד הנתונים: %s\n" +msgstr "נכשל בפתיחת מסד הנתונים: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:396 +#: ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "נכשל בהרצת הצהרת מסד הנתונים: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:450 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "כשל בהסרת פריט היסטוריה: %s\n" +msgstr "נכשל בהסרת פריט היסטוריה: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:474 #, c-format msgid "Failed to clear history: %s\n" -msgstr "כשל בניקוי ההיסטוריה: %s\n" +msgstr "נכשל בניקוי ההיסטוריה: %s\n" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:497 +#: ../midori/main.c:531 +#: ../midori/main.c:547 #, c-format msgid "Failed to add history item: %s\n" -msgstr "כשל בהוספת פריט היסטוריה: %s\n" +msgstr "נכשל בהוספת פריט היסטוריה: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:726 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "כשל בהסרת פריטי היסטוריה ישנים: %s\n" +msgstr "נכשל בהסרת פריטי היסטוריה ישנים: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:755 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "ההגדרות לא ניתנות לשמירה. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:793 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "מנועי החיפוש לא ניתנים לשמירהץ %s" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:812 +#: ../midori/main.c:840 +#: ../midori/main.c:869 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "הסימניה לא ניתנת לשמירה. %s" +msgstr "הסימנייה לא ניתנת לשמירה. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:892 +#: ../midori/main.c:915 #, c-format msgid "The trash couldn't be saved. %s" msgstr "האשפה לא ניתנת לשמירה. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:984 +#: ../midori/main.c:1156 #, c-format msgid "The session couldn't be saved. %s" -msgstr "תצורת ההפעלה לא ניתנת לשמירה. %s" +msgstr "ההפעלה לא ניתנת לשמירה. %s" -#: ../midori/main.c:1073 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"נראה ש־Midori קרס בפעם הקודמת שנפתח. אם זה יקרה שוב,נסה את אחת האפשרויות " -"הבאות לפתירת התקלה." +#: ../midori/main.c:1194 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "נראה ש־Midori קרס בפעם הקודמת שנפתח. אם זה יקרה שוב, נסה את אחת האפשרויות הבאות לפתירת התקלה." -#: ../midori/main.c:1088 +#: ../midori/main.c:1209 msgid "Modify _preferences" -msgstr "ערוך העדפות" +msgstr "ערוך _העדפות" -#: ../midori/main.c:1092 +#: ../midori/main.c:1213 msgid "Reset the last _session" -msgstr "שחזר לתצורת ההפעלה האחרונה" +msgstr "שחזר ל_הפעלה האחרונה" -#: ../midori/main.c:1097 +#: ../midori/main.c:1218 msgid "Disable all _extensions" -msgstr "נטרל את כל ההרחבות" +msgstr "נטרל את כל ה_הרחבות" + +#: ../midori/main.c:1383 +#: ../midori/main.c:1894 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1288 +#: ../midori/main.c:1479 msgid "No filename specified" msgstr "לא צויין שם קובץ" -#: ../midori/main.c:1311 +#: ../midori/main.c:1502 msgid "An unknown error occured." msgstr "התרחשה שגיאה לא מזוהה." -#: ../midori/main.c:1336 +#: ../midori/main.c:1534 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snapshot saved to: %s\n" + +#: ../midori/main.c:1591 msgid "Run ADDRESS as a web application" -msgstr "" +msgstr "Run ADDRESS as a web application" -#: ../midori/main.c:1336 +#: ../midori/main.c:1591 msgid "ADDRESS" -msgstr "" +msgstr "ADDRESS" -#: ../midori/main.c:1338 +#: ../midori/main.c:1594 msgid "Use FOLDER as configuration folder" -msgstr "" +msgstr "Use FOLDER as configuration folder" -#: ../midori/main.c:1338 +#: ../midori/main.c:1594 msgid "FOLDER" -msgstr "" +msgstr "FOLDER" -#: ../midori/main.c:1340 +#: ../midori/main.c:1597 msgid "Run the specified filename as javascript" -msgstr "הרץ את שם הקובץ המצויין כ־javascript" +msgstr "Run the specified filename as javascript" + +#: ../midori/main.c:1600 +msgid "Take a snapshot of the specified URI" +msgstr "Take a snapshot of the specified URI" + +#: ../midori/main.c:1603 +msgid "Execute the specified command" +msgstr "Execute the specified command" -#: ../midori/main.c:1342 +#: ../midori/main.c:1605 msgid "Display program version" -msgstr "הצג גרסת יישום" +msgstr "Display program version" -#: ../midori/main.c:1344 +#: ../midori/main.c:1607 msgid "Addresses" msgstr "כתובות" -#: ../midori/main.c:1385 +#: ../midori/main.c:1672 msgid "[Addresses]" msgstr "[כתובות]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1695 msgid "Please report comments, suggestions and bugs to:" msgstr "אנא דווח תגובות, הצעות ובאגים אל:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1697 msgid "Check for new versions at:" msgstr "בדוק גרסות חדשות ב:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1767 msgid "The specified configuration folder is invalid." -msgstr "" +msgstr "The specified configuration folder is invalid." -#: ../midori/main.c:1489 +#: ../midori/main.c:1815 msgid "An instance of Midori is already running but not responding.\n" msgstr "מופע של Midori כבר רץ אך אינו מגיב. \n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1861 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1879 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "הסימניה לא ניתנת לטעינה: %s\n" - -#: ../midori/main.c:1566 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n" +msgstr "הסימנייה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1907 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "האשפה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1920 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1932 msgid "The following errors occured:" msgstr "השגיאות הבאות התרחשו:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1948 msgid "_Ignore" -msgstr "התעלם" +msgstr "folderהתעלם" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:330 msgid "File not found." msgstr "הקובץ לא נמצא." -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:361 +#: ../midori/midori-array.c:384 +#: ../midori/midori-array.c:394 msgid "Malformed document." msgstr "מסמך לא תקין." -#: ../midori/midori-array.c:338 ../midori/sokoke.c:623 +#: ../midori/midori-array.c:403 +msgid "Unrecognized bookmark format." +msgstr "סוג סימניות לא מזוהה" + +#: ../midori/midori-array.c:567 +#: ../midori/sokoke.c:942 #, c-format msgid "Writing failed." msgstr "הכתיבה נכשלה." -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3357 -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4935 msgid "Reload the current page" msgstr "טען את הדף הנוכחי מחדש" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:4932 msgid "Stop loading the current page" msgstr "הפסק לטעון את הדף הנוכחי" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "%d%% נטען" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:466 #, c-format msgid "Unexpected action '%s'." msgstr "פעולה בלתי צפויה '%s'." -#: ../midori/midori-browser.c:538 +#: ../midori/midori-browser.c:667 msgid "New folder" -msgstr "תיקיה חדשה" +msgstr "תיקייה חדשה" -#: ../midori/midori-browser.c:538 +#: ../midori/midori-browser.c:667 msgid "Edit folder" -msgstr "ערוך תיקיה" +msgstr "ערוך תיקייה" -#: ../midori/midori-browser.c:540 +#: ../midori/midori-browser.c:669 msgid "New bookmark" msgstr "סימניה חדשה" -#: ../midori/midori-browser.c:540 +#: ../midori/midori-browser.c:669 msgid "Edit bookmark" msgstr "ערוך סימניה" -#: ../midori/midori-browser.c:570 +#: ../midori/midori-browser.c:699 msgid "_Title:" -msgstr "כותרת:" +msgstr "_כותרת:" -#: ../midori/midori-browser.c:583 ../midori/midori-searchaction.c:856 +#: ../midori/midori-browser.c:712 +#: ../midori/midori-searchaction.c:951 msgid "_Description:" -msgstr "תיאור:" +msgstr "_תיאור:" -#: ../midori/midori-browser.c:602 ../midori/midori-searchaction.c:870 +#: ../midori/midori-browser.c:731 +#: ../midori/midori-searchaction.c:965 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" -msgstr "כתובת:" +msgstr "_כתובת:" -#: ../midori/midori-browser.c:621 +#: ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:4202 msgid "_Folder:" -msgstr "תיקיה:" +msgstr "_תיקייה:" -#: ../midori/midori-browser.c:626 ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:766 +#: ../midori/midori-browser.c:842 +#: ../midori/midori-browser.c:4207 +#: ../midori/midori-browser.c:4238 msgid "Toplevel folder" msgstr "תיקיית שורש" -#: ../midori/midori-browser.c:743 +#: ../midori/midori-browser.c:795 +msgid "Show in the tool_bar" +msgstr "הסג ב_סרגל הכלים" + +#: ../midori/midori-browser.c:810 +msgid "Run as _web application" +msgstr "הפעל כיישום _רשת" + +#: ../midori/midori-browser.c:918 msgid "Save file as" -msgstr "שמור בשם" +msgstr "שמור קובץ בשם" -#: ../midori/midori-browser.c:1520 +#: ../midori/midori-browser.c:1285 +#: ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "‏%s מתוך %s" + +#: ../midori/midori-browser.c:1321 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "לא ניתן להוריד את הקובץ '%s'." + +#: ../midori/midori-browser.c:1325 +msgid "Transfer completed" +msgstr "ההעברה הושלמה" + +#: ../midori/midori-browser.c:1465 +msgid "Save file" +msgstr "שמור קובץ" + +#: ../midori/midori-browser.c:2170 msgid "Open file" msgstr "פתח קובץ" -#: ../midori/midori-browser.c:2792 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2249 +#: ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "הזנה חדשה" + +#: ../midori/midori-browser.c:2287 +#: ../midori/midori-browser.c:4976 +#: ../panels/midori-bookmarks.c:235 +msgid "Add a new bookmark" +msgstr "הוסף לשונית חדשה" + +#: ../midori/midori-browser.c:3450 +#: ../midori/sokoke.c:266 +#: ../midori/sokoke.c:275 +#: ../midori/sokoke.c:302 +#: ../midori/sokoke.c:323 +#: ../midori/sokoke.c:336 +msgid "Could not run external program." +msgstr "לא ניתן להריץ תוכנה חיצונית." + +#: ../midori/midori-browser.c:3946 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" -msgstr "פתח הכל בלשוניות" +msgstr "פתח הכל ב_לשוניות" -#: ../midori/midori-browser.c:2799 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:3953 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:828 +#: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" -msgstr "פתח בלשונית חדשה" +msgstr "פתח ב_לשונית חדשה" -#: ../midori/midori-browser.c:2802 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:3956 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:830 +#: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" -msgstr "פתח בחלון חדש" +msgstr "פתח ב_חלון חדש" + +#: ../midori/midori-browser.c:4135 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4136 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4137 +msgid "Opera" +msgstr "Opera" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:4157 +msgid "Import bookmarks..." +msgstr "ייבוא סימניות..." + +#: ../midori/midori-browser.c:4160 +#: ../midori/midori-browser.c:4981 +msgid "_Import bookmarks" +msgstr "יי_בוא סימניות" + +#: ../midori/midori-browser.c:4171 +msgid "_Application:" +msgstr "יי_שום:" + +#: ../midori/midori-browser.c:4257 +msgid "Failed to import bookmarks" +msgstr "נכשל בייבוא סימניות" + +#: ../midori/midori-browser.c:4397 msgid "Clear Private Data" -msgstr "" +msgstr "נקה נתונים אישיים" -#: ../midori/midori-browser.c:2966 -msgid "Clear private data" -msgstr "" +#: ../midori/midori-browser.c:4401 +msgid "_Clear private data" +msgstr "_נקה נתונים אישיים" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:4414 msgid "Clear the following data:" -msgstr "" +msgstr "נקה את הנתונים הבאים" -#: ../midori/midori-browser.c:2987 ../midori/midori-preferences.c:628 +#: ../midori/midori-browser.c:4424 +#: ../midori/midori-preferences.c:537 #: ../panels/midori-history.c:108 msgid "History" -msgstr "" +msgstr "היסטוריה" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:4429 msgid "Cookies" -msgstr "" +msgstr "עוגיות" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:4434 msgid "'Flash' Cookies" -msgstr "" +msgstr "עוגיות 'Flash'" -#: ../midori/midori-browser.c:2996 +#: ../midori/midori-browser.c:4439 msgid "Website icons" -msgstr "" +msgstr "אייקונים של אתרים" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:4444 +#: ../midori/sokoke.c:1101 +msgid "_Closed Tabs" +msgstr "לשוניות _שנסגרו" + +#: ../midori/midori-browser.c:4452 +msgid "Clear private data when _quitting Midori" +msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori" + +#: ../midori/midori-browser.c:4548 msgid "A lightweight web browser." msgstr "דפדפן קל משקל." -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:4564 msgid "translator-credits" -msgstr "Shlomi Israel " +msgstr "" +"Shlomi Israel \n" +"Mark Krapivner " -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:4846 msgid "_File" -msgstr "קובץ" +msgstr "_קובץ" -#: ../midori/midori-browser.c:3294 +#: ../midori/midori-browser.c:4848 +#: ../midori/sokoke.c:1102 +msgid "New _Window" +msgstr "_חלון חדש" + +#: ../midori/midori-browser.c:4849 msgid "Open a new window" msgstr "פתח חלון חדש" -#: ../midori/midori-browser.c:3297 +#: ../midori/midori-browser.c:4852 msgid "Open a new tab" msgstr "פתח לשונית חדשה" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:4855 msgid "Open a file" msgstr "פתח קובץ" -#: ../midori/midori-browser.c:3303 +#: ../midori/midori-browser.c:4858 msgid "Save to a file" msgstr "שמור לקובץ" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:4860 +msgid "Add to Speed _dial" +msgstr "הוסף _לחיוג מהיר" + +#: ../midori/midori-browser.c:4861 +msgid "Add shortcut to speed dial" +msgstr "הוספת קיצור דרך לחיוג מהיר" + +#: ../midori/midori-browser.c:4863 +msgid "Add Shortcut to the _desktop" +msgstr "הוספת קיצור דרך ל_שולחן העבודה" + +#: ../midori/midori-browser.c:4864 +msgid "Add shortcut to the desktop" +msgstr "הוספת קיצור דרך לשולחן העבודה" + +#: ../midori/midori-browser.c:4866 +msgid "Subscribe to News _feed" +msgstr "הרשם ל_הזנת חדשות" + +#: ../midori/midori-browser.c:4867 +msgid "Subscribe to this news feed" +msgstr "הרשמה להזנת חדשות זו" + +#: ../midori/midori-browser.c:4872 msgid "_Close Tab" -msgstr "סגור לשונית" +msgstr "_סגור לשונית" -#: ../midori/midori-browser.c:3306 +#: ../midori/midori-browser.c:4873 msgid "Close the current tab" msgstr "סגור את הלשונית הנוכחית" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:4875 msgid "C_lose Window" -msgstr "סגור חלון" +msgstr "ס_גור חלון" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:4876 msgid "Close this window" msgstr "סגור את החלון הזה" -#: ../midori/midori-browser.c:3312 +#: ../midori/midori-browser.c:4879 msgid "Print the current page" msgstr "הדפס את הדף הנוכחי" -#: ../midori/midori-browser.c:3315 +#: ../midori/midori-browser.c:4882 msgid "Quit the application" -msgstr "צא מהיישום" +msgstr "יציאה מהיישום" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:4884 msgid "_Edit" -msgstr "ערוך" +msgstr "_ערוך" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:4888 +msgid "Undo the last modification" +msgstr "ביטול השינוי האחרון" + +#: ../midori/midori-browser.c:4891 +msgid "Redo the last modification" +msgstr "בצע שוב את השינוי האחרון" + +#: ../midori/midori-browser.c:4895 msgid "Cut the selected text" msgstr "גזור את הטקסט המסומן" -#: ../midori/midori-browser.c:3323 ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4901 msgid "Copy the selected text" msgstr "העתק את הטקסט המסומן" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:4904 msgid "Paste text from the clipboard" msgstr "הדבק טקסט מלוח הגזירים" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:4907 msgid "Delete the selected text" msgstr "מחק את הטקסט המסומן" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:4910 msgid "Select all text" msgstr "סמן את כל הטקסט" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:4913 msgid "Find a word or phrase in the page" -msgstr "מצא מילה או ביטוי בדף" +msgstr "חפש מילה או ביטוי בדף" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:4915 msgid "Find _Next" -msgstr "מצא את הבא" +msgstr "חפש את ה_בא" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:4916 msgid "Find the next occurrence of a word or phrase" -msgstr "מצא את המופע הבא של המילה או הביטוי" +msgstr "חפש את המופע הבא של המילה או הביטוי" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:4918 msgid "Find _Previous" -msgstr "מצא את הקודם" +msgstr "חפש את ה_קודם" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:4919 msgid "Find the previous occurrence of a word or phrase" -msgstr "מצא את המופע הקודם של המילה או הביטוי" - -#: ../midori/midori-browser.c:3347 -msgid "_Quick Find" -msgstr "חיפוש מהיר" - -#: ../midori/midori-browser.c:3348 -msgid "Quickly jump to a word or phrase" -msgstr "קופץ במהירות אל מילה או ביטוי" +msgstr "חפש את המופע הקודם של המילה או הביטוי" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:4923 msgid "Configure the application preferences" msgstr "הגדר את העדפות היישום" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:4925 msgid "_View" -msgstr "תצוגה" +msgstr "_תצוגה" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:4926 msgid "_Toolbars" -msgstr "סרגלי כלים" +msgstr "_סרגלי כלים" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:4938 msgid "Increase the zoom level" -msgstr "הגדל את רמת הזום" +msgstr "הגדל את רמת ההגדלה" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:4941 msgid "Decrease the zoom level" -msgstr "הקטן את רמת הזום" +msgstr "הקטן את רמת ההגדלה" -#: ../midori/midori-browser.c:3372 +#: ../midori/midori-browser.c:4944 msgid "Reset the zoom level" msgstr "אפס את רמת הזום" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:4945 msgid "_Encoding" -msgstr "קידוד" - -#: ../midori/midori-browser.c:3375 -msgid "_Automatic" -msgstr "אוטומטי" - -#: ../midori/midori-browser.c:3378 ../midori/midori-websettings.c:196 -msgid "Chinese (BIG5)" -msgstr "" - -#: ../midori/midori-browser.c:3381 ../midori/midori-websettings.c:197 -msgid "Japanese (SHIFT_JIS)" -msgstr "" - -#: ../midori/midori-browser.c:3384 ../midori/midori-websettings.c:198 -msgid "Russian (KOI8-R)" -msgstr "" - -#: ../midori/midori-browser.c:3387 ../midori/midori-websettings.c:199 -msgid "Unicode (UTF-8)" -msgstr "" - -#: ../midori/midori-browser.c:3390 ../midori/midori-websettings.c:200 -msgid "Western (ISO-8859-1)" -msgstr "" - -#: ../midori/midori-browser.c:3393 ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 -msgid "Custom..." -msgstr "" +msgstr "_קידוד" -#: ../midori/midori-browser.c:3396 ../midori/midori-view.c:1141 -msgid "View _Source" -msgstr "הצג מקור" +#: ../midori/midori-browser.c:4947 +msgid "View So_urce" +msgstr "הצג מ_קור" -#: ../midori/midori-browser.c:3397 +#: ../midori/midori-browser.c:4948 msgid "View the source code of the page" msgstr "הצג את קוד המקור של הדף" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:4950 msgid "View Selection Source" msgstr "הצג את מקור הבחירה" -#: ../midori/midori-browser.c:3400 +#: ../midori/midori-browser.c:4951 msgid "View the source code of the selection" msgstr "הצג את קוד המקור של הבחירה" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:4955 msgid "Toggle fullscreen view" msgstr "מסך מלא" -#: ../midori/midori-browser.c:3406 +#: ../midori/midori-browser.c:4957 msgid "_Go" msgstr "לך" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:4960 msgid "Go back to the previous page" msgstr "לך אל הדף הקודם" -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:4963 msgid "Go forward to the next page" msgstr "לך אל הדף הבא" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:4966 msgid "Go to your homepage" msgstr "לך אל דף הבית" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:4968 msgid "Empty Trash" msgstr "רוקן אשפה" -#: ../midori/midori-browser.c:3418 +#: ../midori/midori-browser.c:4969 msgid "Delete the contents of the trash" msgstr "מחק את תכולת האשפה" -#: ../midori/midori-browser.c:3420 ../midori/midori-view.c:1113 -msgid "Undo Close Tab" -msgstr "בטל סגירת לשונית" +#: ../midori/midori-browser.c:4971 +msgid "Undo _Close Tab" +msgstr "בטל _סגירת לשונית" -#: ../midori/midori-browser.c:3421 +#: ../midori/midori-browser.c:4972 msgid "Open the last closed tab" msgstr "פתח את הלשונית האחרונה שנסגרה" -#: ../midori/midori-browser.c:3425 ../panels/midori-bookmarks.c:232 -msgid "Add a new bookmark" -msgstr "הוסף לשונית חדשה" - -#: ../midori/midori-browser.c:3427 ../panels/midori-bookmarks.c:261 -msgid "Add a new folder" -msgstr "" +#: ../midori/midori-browser.c:4978 +msgid "Add a new _folder" +msgstr "הוסף _תיקייה חדשה" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:4979 msgid "Add a new bookmark folder" -msgstr "" +msgstr "הוסף תיקיית סימניות חדשה" -#: ../midori/midori-browser.c:3429 -msgid "_Tools" -msgstr "כלים" - -#: ../midori/midori-browser.c:3431 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:4984 +#: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" -msgstr "נהל מנועי חיפוש" +msgstr "_נהל מנועי חיפוש" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:4985 msgid "Add, edit and remove search engines..." msgstr "הוסף, ערוך והסר מנועי חיפוש..." -#: ../midori/midori-browser.c:3435 +#: ../midori/midori-browser.c:4988 msgid "_Clear Private Data" -msgstr "" +msgstr "_נקה נתונים אישיים" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:4989 msgid "Clear private data..." -msgstr "" +msgstr "נקה נתונים אישיים..." -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:4993 msgid "_Previous Tab" -msgstr "לשונית קודמת" +msgstr "לשונית _קודמת" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:4994 msgid "Switch to the previous tab" msgstr "עבור אל הלשונית הקודמת" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:4996 msgid "_Next Tab" -msgstr "לשונית הבאה" +msgstr "לשונית _הבאה" -#: ../midori/midori-browser.c:3444 +#: ../midori/midori-browser.c:4997 msgid "Switch to the next tab" msgstr "עבור אל הלשונית הבאה" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:4999 +msgid "Focus _Current Tab" +msgstr "מיקוד לשונית _נוכחית" + +#: ../midori/midori-browser.c:5000 +msgid "Focus the current tab" +msgstr "התמקד בלשונית הנוכחית" + +#: ../midori/midori-browser.c:5002 +msgid "Open last _session" +msgstr "פתח _הפעלה קודמת" + +#: ../midori/midori-browser.c:5003 +msgid "Open the tabs saved in the last session" +msgstr "פתח את הלשוניות שנפתחו בהפעלה הקודמת" + +#: ../midori/midori-browser.c:5005 msgid "_Help" -msgstr "עזרה" +msgstr "_עזרה" -#: ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:5007 msgid "_Contents" -msgstr "תכנים" +msgstr "_תכנים" -#: ../midori/midori-browser.c:3449 +#: ../midori/midori-browser.c:5008 msgid "Show the documentation" msgstr "הצג את התיעוד" -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:5010 msgid "_Frequent Questions" -msgstr "שאלות נפוצות" +msgstr "שאלות _נפוצות" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:5011 msgid "Show the Frequently Asked Questions" msgstr "הצג את השאלות הנפוצות" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:5013 msgid "_Report a Bug" -msgstr "דווח על באג" +msgstr "_דווח על באג" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:5014 msgid "Open Midori's bug tracker" msgstr "פתח את עוקב הבאגים של Midori" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:5017 msgid "Show information about the program" msgstr "הצג מידע אודות התוכנה" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:5024 msgid "P_rivate Browsing" -msgstr "גלישה פרטית" +msgstr "גלישה פ_רטית" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:5025 msgid "Don't save any private data while browsing" msgstr "אל תשמור אף מידע אישי בזמן הגלישה" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:5030 msgid "_Menubar" -msgstr "סרגל תפריט" +msgstr "סרגל _תפריט" -#: ../midori/midori-browser.c:3472 +#: ../midori/midori-browser.c:5031 msgid "Show menubar" msgstr "הצג את סרגל התפריט" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:5034 msgid "_Navigationbar" -msgstr "סרגל ניווט" +msgstr "סרגל _ניווט" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:5035 msgid "Show navigationbar" msgstr "הצג את סרגל הניווט" -#: ../midori/midori-browser.c:3479 +#: ../midori/midori-browser.c:5038 msgid "Side_panel" -msgstr "סרגל צד" +msgstr "_סרגל צד" -#: ../midori/midori-browser.c:3480 +#: ../midori/midori-browser.c:5039 msgid "Show sidepanel" msgstr "הצג סרגל צד" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:5042 msgid "_Bookmarkbar" -msgstr "סרגל סימניות" +msgstr "_סרגל סימניות" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:5043 msgid "Show bookmarkbar" msgstr "הצג את סרגל הסימניות" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:5046 msgid "_Transferbar" -msgstr "סרגל העברה" +msgstr "_סרגל העברות" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:5047 msgid "Show transferbar" msgstr "הצג את סרגל ההעברה" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:5050 msgid "_Statusbar" -msgstr "שורת מצב" +msgstr "_שורת מצב" -#: ../midori/midori-browser.c:3492 +#: ../midori/midori-browser.c:5051 msgid "Show statusbar" msgstr "הצג את שורת המצב" -#: ../midori/midori-browser.c:3926 +#: ../midori/midori-browser.c:5058 +msgid "_Automatic" +msgstr "_אוטומטי" + +#: ../midori/midori-browser.c:5061 +#: ../midori/midori-websettings.c:215 +msgid "Chinese (BIG5)" +msgstr "סינית (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:5065 +msgid "Japanese (SHIFT__JIS)" +msgstr "יפנית (SHIFT__JIS)" + +#: ../midori/midori-browser.c:5068 +#: ../midori/midori-websettings.c:217 +msgid "Korean (EUC-KR)" +msgstr "קוריאנית (EUC-KR)" + +#: ../midori/midori-browser.c:5071 +#: ../midori/midori-websettings.c:218 +msgid "Russian (KOI8-R)" +msgstr "רוסית (KOI8-R)" + +#: ../midori/midori-browser.c:5074 +#: ../midori/midori-websettings.c:219 +msgid "Unicode (UTF-8)" +msgstr "יוניקוד (UTF-8)" + +#: ../midori/midori-browser.c:5077 +#: ../midori/midori-websettings.c:220 +msgid "Western (ISO-8859-1)" +msgstr "מערבי (ISO-8859-1)" + +#: ../midori/midori-browser.c:5080 +#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:295 +#: ../katze/katze-utils.c:664 +msgid "Custom..." +msgstr "מותאם..." + +#: ../midori/midori-browser.c:5569 msgid "_Separator" -msgstr "קו מפריד" +msgstr "קו _מפריד" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:5576 msgid "_Location..." -msgstr "מיקום..." +msgstr "_מיקום..." -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:5578 msgid "Open a particular location" -msgstr "פתח מיקום" +msgstr "פתיחת מיקום מסוים" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:5602 msgid "_Web Search..." -msgstr "חיפוש באינטרנט" +msgstr "חיפוש ב_רשת..." -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:5604 msgid "Run a web search" msgstr "הרץ חיפוש באינטרנט" -#: ../midori/midori-browser.c:3980 +#: ../midori/midori-browser.c:5625 msgid "Reopen a previously closed tab or window" msgstr "פתח מחדש לשונית או חלון שנסגרו קודם לכן" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:5640 msgid "_Recently visited pages" -msgstr "דפים שבוקרו בעבר" +msgstr "דפים שבוקרו _לאחרונה" -#: ../midori/midori-browser.c:3995 +#: ../midori/midori-browser.c:5642 msgid "Reopen pages that you visited earlier" -msgstr "פתיחה מחדש של דפים שביקרת בהם בעבר" +msgstr "פתיחה מחדש בדפים שביקרת בהם בעבר" -#: ../midori/midori-browser.c:4008 ../midori/sokoke.c:778 +#: ../midori/midori-browser.c:5657 +#: ../midori/sokoke.c:1091 msgid "_Bookmarks" -msgstr "סימניות" +msgstr "_סימניות" -#: ../midori/midori-browser.c:4010 +#: ../midori/midori-browser.c:5659 msgid "Show the saved bookmarks" msgstr "הצג את הסימניות השמורות" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:5674 +msgid "_Tools" +msgstr "_כלים" + +#: ../midori/midori-browser.c:5686 msgid "_Window" -msgstr "חלון" +msgstr "_חלון" -#: ../midori/midori-browser.c:4025 +#: ../midori/midori-browser.c:5688 msgid "Show a list of all open tabs" msgstr "הצג רשימה של כל הלשוניות הפתוחות" +#: ../midori/midori-browser.c:5702 +msgid "_Menu" +msgstr "_תפריט" + +#: ../midori/midori-browser.c:5704 +msgid "Menu" +msgstr "תפריט" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:5895 msgid "_Inline Find:" -msgstr "חיפוש פנימי" +msgstr "חיפוש _פנימי:" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:5926 msgid "Previous" msgstr "הקודם" -#: ../midori/midori-browser.c:4222 +#: ../midori/midori-browser.c:5931 msgid "Next" msgstr "הבא" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:5936 msgid "Match Case" msgstr "התאם רישיות" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:5945 msgid "Highlight Matches" msgstr "הדגש התאמות" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:5957 msgid "Close Findbar" msgstr "סגור סרגל חיפוש" -#: ../midori/midori-browser.c:4551 +#: ../midori/midori-browser.c:6003 +#: ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "נקה הכל" + +#: ../midori/midori-browser.c:6364 #, c-format msgid "Unexpected setting '%s'" msgstr "הגדרה לא צפויה '%s'" -#: ../midori/midori-panel.c:309 -msgid "Detach chosen panel from the window" -msgstr "" +#: ../midori/midori-locationaction.c:974 +#, c-format +msgid "Search with %s" +msgstr "חיפוש בעזרת %s" -#: ../midori/midori-panel.c:311 -msgid "Whether to detach the chosen panel from the window" -msgstr "" +#: ../midori/midori-panel.c:415 +#: ../midori/midori-panel.c:417 +msgid "Detach chosen panel from the window" +msgstr "נתן את הסרגל הנבחר מהחלון" -#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:511 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:427 +#: ../midori/midori-panel.c:429 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 +msgid "Align sidepanel to the right" msgstr "יישר סרגל צד לימין" -#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:512 -msgid "Whether to align the sidepanel on the right" -msgstr "האם ליישר את סרגל הצד לימין" - -#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:439 +#: ../midori/midori-panel.c:440 msgid "Close panel" msgstr "סגור סרגל" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1945 -msgid "Blank page" -msgstr "דף ריק" +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 +msgid "Align sidepanel to the left" +msgstr "יישר סרגל צד לשמאל" -#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 -msgid "Homepage" -msgstr "דף הבית" +#: ../midori/midori-panel.c:697 +msgid "Show panel _titles" +msgstr "הצג כותרות סרגל" + +#: ../midori/midori-panel.c:704 +msgid "Show operating _controls" +msgstr "הצג _בקרת פעילות" + +#: ../midori/midori-panel.c:793 +msgid "Options" +msgstr "אפשרויות" + +#: ../midori/midori-websettings.c:198 +msgid "Show Blank page" +msgstr "הצג דף ריק" + +#: ../midori/midori-websettings.c:199 +msgid "Show Homepage" +msgstr "הצג את דף הבית" -#: ../midori/midori-websettings.c:181 -msgid "Last open pages" -msgstr "הדפים שנפתחו אחרונים" +#: ../midori/midori-websettings.c:200 +msgid "Show last open tabs" +msgstr "הצג רשימת לשוניות שנפתחו קודם" #: ../midori/midori-websettings.c:216 +msgid "Japanese (SHIFT_JIS)" +msgstr "יפנית (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:236 msgid "New tab" msgstr "לשונית חדשה" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:237 msgid "New window" msgstr "חלון חדש" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:238 msgid "Current tab" msgstr "לשונית נוכחית" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:253 msgid "Default" msgstr "ברירת מחדל" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:254 msgid "Icons" msgstr "סמלים" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:255 +msgid "Small icons" +msgstr "סמלים קטנים" + +#: ../midori/midori-websettings.c:256 msgid "Text" msgstr "טקסט" -#: ../midori/midori-websettings.c:236 -msgid "Both" -msgstr "שניהם" +#: ../midori/midori-websettings.c:257 +msgid "Icons and text" +msgstr "סמלים וטקסט" -#: ../midori/midori-websettings.c:237 -msgid "Both horizontal" -msgstr "" +#: ../midori/midori-websettings.c:258 +msgid "Text beside icons" +msgstr "טקסט לצד סמלים" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:273 msgid "All cookies" msgstr "כל העוגיות" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:274 msgid "Session cookies" -msgstr "עוגיות תצורת הפעלה" +msgstr "עוגיות הפעלה" -#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:275 +#: ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:644 +#: ../extensions/shortcuts.c:94 msgid "None" msgstr "כלום" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:291 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:292 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:293 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:294 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:347 msgid "Remember last window size" msgstr "זכור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:348 msgid "Whether to save the last window size" msgstr "האם לשמור את גודל החלון האחרון" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:356 msgid "Last window width" msgstr "רוחב החלון האחרון" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:357 msgid "The last saved window width" msgstr "הרוחב האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:365 msgid "Last window height" msgstr "אורך החלון האחרון" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:366 msgid "The last saved window height" msgstr "האורך האחרון של החלון הנשמר" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:391 msgid "Last panel position" msgstr "המיקום האחרון של הסרגל" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:392 msgid "The last saved panel position" msgstr "המיקום האחרון של הסרגל שנשמר" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:401 msgid "Last panel page" msgstr "העמוד האחרון של הסרגל" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:402 msgid "The last saved panel page" msgstr "העמוד האחרון של הסרגל שנשמר" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:410 msgid "Last Web search" msgstr "החיפוש האחרון" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:411 msgid "The last saved Web search" msgstr "חיפוש האינטרנט האחרון שנשמר" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:420 msgid "Show Menubar" msgstr "הצג סרגל תפריט" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the menubar" msgstr "האם להראות את סרגל התפריטים" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:429 msgid "Show Navigationbar" msgstr "הצג סרגל ניווט" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the navigationbar" msgstr "האם להציג את סרגל הניווט" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:438 msgid "Show Bookmarkbar" msgstr "הצג סרגל סימניות" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:439 msgid "Whether to show the bookmarkbar" msgstr "האם להראות את סרגל הסימניות" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:447 msgid "Show Panel" msgstr "הצג סרגל" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the panel" msgstr "האם להציג את הסרגל" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:463 msgid "Show Transferbar" msgstr "הצג סרגל העברות" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:464 msgid "Whether to show the transferbar" msgstr "האם להציג את סרגל ההעברות" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:472 msgid "Show Statusbar" msgstr "הצג שורת מצב" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:473 msgid "Whether to show the statusbar" msgstr "האם להציג את שורת המצב" -#: ../midori/midori-websettings.c:460 -msgid "Toolbar Style" -msgstr "סגנון סרגל כלים" +#: ../midori/midori-websettings.c:482 +msgid "Toolbar Style:" +msgstr "סגנון סרגל כלים:" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:483 msgid "The style of the toolbar" msgstr "הסגנון של סרגל הכלים" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:499 msgid "Show progress in location entry" msgstr "הצג התקדמות בתיבת המיקום" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:500 msgid "Whether to show loading progress in the location entry" msgstr "האם להציג את התקדמות הטעינה בתיבת המיקום" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:515 +msgid "Search engines in location completion" +msgstr "מנועי חיפוש בהשלמת הכתובות" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to show search engines in the location completion" +msgstr "האם להציג את מנועי החיפוש בהשלמת הכתובות" + +#: ../midori/midori-websettings.c:524 msgid "Toolbar Items" msgstr "פריטי סרגל כלים" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:525 msgid "The items to show on the toolbar" msgstr "הפריטים להצגה בסרגל הכלים" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:533 msgid "Compact Sidepanel" msgstr "סרגל צד קומפקטי" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:534 msgid "Whether to make the sidepanel compact" msgstr "האם להפוך את סרגל הצד לקומפקטי" -#: ../midori/midori-websettings.c:521 -msgid "Load on Startup" -msgstr "טען בהפעלה" +#: ../midori/midori-websettings.c:549 +msgid "Show operating controls of the panel" +msgstr "הצג בקרת הפעלה בסרגל" -#: ../midori/midori-websettings.c:522 -msgid "What to load on startup" -msgstr "האם לטעון בהפעלה" +#: ../midori/midori-websettings.c:550 +msgid "Whether to show the operating controls of the panel" +msgstr "האם להציג את בקרת פעילות בסרגל" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:565 +msgid "Align sidepanel on the right" +msgstr "יישר סרגל צד לימין" + +#: ../midori/midori-websettings.c:566 +msgid "Whether to align the sidepanel on the right" +msgstr "האם ליישר את סרגל הצד לימין" + +#: ../midori/midori-websettings.c:575 +msgid "When Midori starts:" +msgstr "כאשר Midori מופעל:" + +#: ../midori/midori-websettings.c:576 +msgid "What to do when Midori starts" +msgstr "מה לעשות כאשר Midori מופעל" + +#: ../midori/midori-websettings.c:585 +msgid "Homepage:" +msgstr "דף הבית:" + +#: ../midori/midori-websettings.c:586 msgid "The homepage" msgstr "דף הבית" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:601 msgid "Show crash dialog" -msgstr "הצג דו־שיח קריסות" +msgstr "הצג חלון קריסה" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:602 msgid "Show a dialog after Midori crashed" -msgstr "הצג דו־שיח לאחר ש־Midori קורס" +msgstr "הצג חלון לאחר ש־Midori קורס" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:618 +msgid "Show speed dial in new tabs" +msgstr "הצג חיוג מהיר בלשוניות חדשות" -#: ../midori/midori-websettings.c:556 -msgid "Download Folder" -msgstr "הורד תיקיה" +#: ../midori/midori-websettings.c:619 +msgid "Show speed dial in newly opened tabs" +msgstr "הצג חיוג מהיר בלשוניות חדשות" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:627 +msgid "Save downloaded files to:" +msgstr "שמור קבצים שהורדו אל:" + +#: ../midori/midori-websettings.c:628 msgid "The folder downloaded files are saved to" -msgstr "קבצי התיקיה המורדת ישמרו ב" +msgstr "קבצים שהורדו ישמרו בתיקייה" + +#: ../midori/midori-websettings.c:649 +msgid "Ask for the destination folder" +msgstr "שאל עבור תיקייה יעד" + +#: ../midori/midori-websettings.c:650 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "האם לשאול על תיקיית היעד בזמן הורדת קבץ" + +#: ../midori/midori-websettings.c:669 +msgid "Notify when a transfer has been completed" +msgstr "להודיעה לי כאשר הורדה מסתיימת" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:670 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "האם להציג הודעה כאשר העברה מסתיימת" + +#: ../midori/midori-websettings.c:682 msgid "Download Manager" msgstr "מנהל הורדות" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:683 msgid "An external download manager" msgstr "מנהל הורדות חיצוני" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:691 msgid "Text Editor" msgstr "עורך טקסט" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:692 msgid "An external text editor" msgstr "עורך טקסט חיצוני" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:707 +msgid "News Aggregator" +msgstr "אוגר חדשות" + +#: ../midori/midori-websettings.c:708 +msgid "An external news aggregator" +msgstr "אוגר חדשות חיצוני" + +#: ../midori/midori-websettings.c:716 msgid "Location entry Search" msgstr "חיפוש בתיבת מיקום" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:717 msgid "The search to perform inside the location entry" msgstr "החיפוש לביצוע בתוך תיבת המיקום" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:725 msgid "Preferred Encoding" msgstr "קידוד מועדף" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:726 msgid "The preferred character encoding" msgstr "הקידוד המועדף" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:736 msgid "Always Show Tabbar" msgstr "תמיד הצג סרגל לשוניות" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:737 msgid "Always show the tabbar" msgstr "תמיד הצג את סרגל הלשוניות" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:745 msgid "Close Buttons on Tabs" msgstr "לחצני סגירה בלשוניות" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:746 msgid "Whether tabs have close buttons" msgstr "האם ללשוניות יש לחצני סגירה" -#: ../midori/midori-websettings.c:625 -msgid "Open new pages in" -msgstr "פתיחת דפים חדשים ב" +#: ../midori/midori-websettings.c:754 +msgid "Open new pages in:" +msgstr "פתיחת דפים חדשים ב:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:755 msgid "Where to open new pages" msgstr "איפה לפתוח דפים חדשים" -#: ../midori/midori-websettings.c:635 -msgid "Open external pages in" -msgstr "פתח דפים חיצוניים ב" +#: ../midori/midori-websettings.c:764 +msgid "Open external pages in:" +msgstr "פתח דפים חיצוניים ב:" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:765 msgid "Where to open externally opened pages" msgstr "איפה לפתוח דפים חיצוניים" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:774 msgid "Middle click opens Selection" msgstr "לחיצה אמצעית פותחת בחירה" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:775 msgid "Load an address from the selection via middle click" msgstr "פתח את הכתובת הנבחרת באמצעות לחצן אמצעי בעכבר" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:783 msgid "Open tabs in the background" msgstr "פתח לשוניות ברקע" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:784 msgid "Whether to open new tabs in the background" msgstr "האם לפתוח לשוניות חדשות ברקע" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:792 msgid "Open Tabs next to Current" msgstr "פתח לשוניות אחרי הנוכחית" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:793 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "האם לפתוח לשוניות אחרי הלשונית הנוכחית או אחרי הלשונית האחרונה" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:801 msgid "Open popups in tabs" msgstr "פתח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:802 msgid "Whether to open popup windows in tabs" msgstr "האם לפתוח חלונות קופצים בלשוניות" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:812 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "טען תמונות אוטומטית" + +#: ../midori/midori-websettings.c:813 +msgid "Load and display images automatically" +msgstr "טען והצג תמונות אוטומטית" + +#: ../midori/midori-websettings.c:820 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "הפעל תסריטים" + +#: ../midori/midori-websettings.c:821 +msgid "Enable embedded scripting languages" +msgstr "הפעל שפות תסריטים משובצות" + +#: ../midori/midori-websettings.c:828 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "הפעל תוספי Netscape" + +#: ../midori/midori-websettings.c:829 +msgid "Enable embedded Netscape plugin objects" +msgstr "הפעל אובייקטי תוספי Netscape משובצים" + +#: ../midori/midori-websettings.c:844 msgid "Zoom Text and Images" msgstr "קרב טקסט ותמונות" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:845 msgid "Whether to zoom text and images" msgstr "האם לקרב טקסט ותמונות" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:860 msgid "Find inline while typing" msgstr "חפש תוך כדי הקלדה" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:861 msgid "Whether to automatically find inline while typing" msgstr "האם לחפש אוטומטית בתוך הטקסט בזמן הקלדה" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:876 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:877 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:885 msgid "Accept cookies" -msgstr "קבל עוגיות" +msgstr "קבלת עוגיות" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:886 msgid "What type of cookies to accept" msgstr "איזה סוג של עוגיות לקבל" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:895 msgid "Original cookies only" msgstr "עוגיות מקוריות בלבד" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:896 msgid "Accept cookies from the original website only" msgstr "קבל עוגיות מהאתר המקורי בלבד" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:904 msgid "Maximum cookie age" msgstr "תוקף העוגיות המקסימלי" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:905 msgid "The maximum number of days to save cookies for" msgstr "מספר הימים המקסימלי לשמירת עוגיות" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:922 msgid "Remember last visited pages" msgstr "זכור דפים שנשמרו לאחרונה" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:923 msgid "Whether the last visited pages are saved" msgstr "האם הדפים שנשמרו אחרונים ישמרו" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:931 msgid "Maximum history age" msgstr "תוקף מקסימלי להיסטוריה" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:932 msgid "The maximum number of days to save the history for" msgstr "מספר הימים המקסימלי לשמירת היסטוריה" -#: ../midori/midori-websettings.c:766 -msgid "Remember last form inputs" -msgstr "זכור קלטי הטופס האחרונים" - -#: ../midori/midori-websettings.c:767 -msgid "Whether the last form inputs are saved" -msgstr "האם לשמור את קלטי הטופס האחרונים" - -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:940 msgid "Remember last downloaded files" -msgstr "זכור את הקבצים האחרונים שהורדו" +msgstr "זכור את הקבצים האחרונים שירדו" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:941 msgid "Whether the last downloaded files are saved" -msgstr "האם לשמור את הקבצים האחרונים שהורדו" +msgstr "האם לשמור את הקבצים האחרונים שירדו" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:951 msgid "Proxy Server" msgstr "שרת מתווך" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:952 msgid "The proxy server used for HTTP connections" msgstr "השרת המתווך המשמש עבור חיבורי HTTP" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:967 msgid "Detect proxy server automatically" msgstr "זהה שרת מתווך אוטומטית" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:968 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "האם לזהות את השרת המתווך אוטומטית מהסביבה" +msgstr "האם לזהות את השרת המתווך אוטומטית מסביבת העבודה" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:984 msgid "Identify as" -msgstr "זהה כ" +msgstr "הזדהה בתור" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:985 msgid "What to identify as to web pages" msgstr "כיצד להזדהות עבור דפי אינטרנט" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:1001 msgid "Identification string" msgstr "מחרוזת זיהוי" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:1002 msgid "The application identification string" msgstr "מחרוזת הזיהוי של היישום" -#: ../midori/midori-websettings.c:845 -msgid "Cache size" -msgstr "גדול מטמון" +#: ../midori/midori-websettings.c:1017 +msgid "Clear private data" +msgstr "נקה נתונים אישיים" -#: ../midori/midori-websettings.c:846 -msgid "The allowed size of the cache" -msgstr "הגודל המותר של המטמון" +#: ../midori/midori-websettings.c:1018 +msgid "The private data selected for deletion" +msgstr "המידע האישי שנבחר למחיקה" -#. i18n: The title of the 404 - Not found error page +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:636 ../midori/midori-view.c:2469 +#: ../midori/midori-view.c:915 +#: ../midori/midori-view.c:3805 +#: ../midori/midori-view.c:3809 +#, c-format +msgid "Error - %s" +msgstr "שגיאה - %s" + +#: ../midori/midori-view.c:916 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "העמוד '%s' לא ניתן לטעינה." + +#: ../midori/midori-view.c:921 +msgid "Try again" +msgstr "נסה שוב" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" -msgstr "לא נמצא - %s" +msgstr "‏%s - לא נמצא" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1168 +#: ../midori/midori-view.c:1897 +#, c-format +msgid "Send a message to %s" +msgstr "שלח הודעה אל %s" + +#: ../midori/midori-view.c:1731 +#: ../midori/midori-view.c:1799 msgid "Open _Link" -msgstr "פתח קישור" +msgstr "פתח _קישור" -#: ../midori/midori-view.c:980 +#: ../midori/midori-view.c:1734 +#: ../midori/midori-view.c:1801 msgid "Open Link in New _Tab" -msgstr "פתח קישור בלשונית חדשה" +msgstr "פתח קישור ב_לשונית חדשה" + +#: ../midori/midori-view.c:1738 +msgid "Open Link in _Foreground Tab" +msgstr "פתח קישור בלשונית ש_בחזית" + +#: ../midori/midori-view.c:1739 +msgid "Open Link in _Background Tab" +msgstr "פתח קישור בלשונית ש_ברקע" -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1742 +#: ../midori/midori-view.c:1808 msgid "Open Link in New _Window" -msgstr "" +msgstr "פתח קישור ב_חלון חדש" -#: ../midori/midori-view.c:1006 -msgid "_Download Link destination" -msgstr "" +#: ../midori/midori-view.c:1745 +msgid "_Copy Link destination" +msgstr "_העתק את יעד הקישור" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:1748 +#: ../midori/midori-view.c:1820 msgid "_Save Link destination" -msgstr "" +msgstr "_שמור את יעד הקישור" + +#: ../midori/midori-view.c:1749 +#: ../midori/midori-view.c:1814 +msgid "_Download Link destination" +msgstr "_הורד את יעד הקישור" -#: ../midori/midori-view.c:1021 +#: ../midori/midori-view.c:1753 +#: ../midori/midori-view.c:1789 +#: ../midori/midori-view.c:1825 msgid "Download with Download _Manager" -msgstr "" +msgstr "הורד בעזרת _מנהל הורדות" -#: ../midori/midori-view.c:1053 -#, c-format -msgid "Search with %s" -msgstr "" +#: ../midori/midori-view.c:1765 +msgid "Open _Image in New Tab" +msgstr "פתח את ה_תמונה בלשונית חדשה" + +#: ../midori/midori-view.c:1768 +msgid "Open Image in New Wi_ndow" +msgstr "פתח את התמונה בח_לון חדש" -#: ../midori/midori-view.c:1079 +#: ../midori/midori-view.c:1771 +msgid "Copy Image _Address" +msgstr "העתק _כתובת תמונה" + +#: ../midori/midori-view.c:1774 +msgid "Save I_mage" +msgstr "שמור ת_מונה" + +#: ../midori/midori-view.c:1775 +msgid "Download I_mage" +msgstr "הורד ת_מונה" + +#: ../midori/midori-view.c:1782 +msgid "Copy Video _Address" +msgstr "העתק _כתובת וידאו" + +#: ../midori/midori-view.c:1785 +msgid "Save _Video" +msgstr "שמור _וידאו" + +#: ../midori/midori-view.c:1785 +msgid "Download _Video" +msgstr "הורד _וידאו" + +#: ../midori/midori-view.c:1845 +msgid "Search _with" +msgstr "חיפוש _בעזרת" + +#: ../midori/midori-view.c:1873 +#: ../midori/midori-view.c:1884 msgid "_Search the Web" -msgstr "" +msgstr "_חיפוש ברשת" -#: ../midori/midori-view.c:1089 +#: ../midori/midori-view.c:1905 msgid "Open Address in New _Tab" -msgstr "" +msgstr "פתח את הכתובות ב_לשונית חדשה" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:2164 msgid "Open or download file" -msgstr "" +msgstr "פתח או הורד קובץ" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:2187 #, c-format msgid "File Type: '%s'" -msgstr "" +msgstr "סוג הקובץ: '%s'" -#: ../midori/midori-view.c:1257 +#: ../midori/midori-view.c:2190 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "סוג הקובץ: %s ‏('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1261 +#: ../midori/midori-view.c:2194 #, c-format msgid "Open %s" -msgstr "" +msgstr "פתח את %s" -#: ../midori/midori-view.c:1657 +#: ../midori/midori-view.c:2710 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "בדיקת עמוד - %s" + +#: ../midori/midori-view.c:2928 +msgid "Speed dial" +msgstr "חיוג מהיר" + +#: ../midori/midori-view.c:2929 +msgid "Click to add a shortcut" +msgstr "לחת כאן כדי להוסיף קיצור דרך" -#: ../midori/midori-view.c:1802 +#: ../midori/midori-view.c:2930 +msgid "Enter shortcut address" +msgstr "הזן כתובת לקיצור" + +#: ../midori/midori-view.c:2931 +msgid "Enter shortcut title" +msgstr "הזן כותרת לקיצור" + +#: ../midori/midori-view.c:2932 +msgid "Are you sure you want to delete this shortcut?" +msgstr "אתה בטוח שברצונך למחוק את קיצור הדרך?" + +#: ../midori/midori-view.c:2962 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "לא ניתן להציג תיעוד" -#: ../midori/midori-view.c:1818 +#: ../midori/midori-view.c:2979 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "אין תיעוד מותקן" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "" +#: ../midori/midori-view.c:3106 +msgid "Blank page" +msgstr "דף ריק" -#. Page "General" +#: ../midori/midori-view.c:3349 +msgid "_Duplicate Tab" +msgstr "_שכפל לשונית" + +#: ../midori/midori-view.c:3354 +msgid "_Restore Tab" +msgstr "_שחזר לשונית" + +#: ../midori/midori-view.c:3354 +msgid "_Minimize Tab" +msgstr "_מזער לשונית" + +#: ../midori/midori-view.c:3911 +msgid "Print background images" +msgstr "הדפס תמונות רקע" + +#: ../midori/midori-view.c:3912 +msgid "Whether background images should be printed" +msgstr "האם להדפיס תמונות רקע" + +#: ../midori/midori-view.c:3956 #: ../midori/midori-preferences.c:398 +msgid "Features" +msgstr "תוכונות" + +#. Page "General" +#: ../midori/midori-preferences.c:318 msgid "General" -msgstr "" +msgstr "כללי" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:319 msgid "Startup" -msgstr "" +msgstr "הפעלה" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:341 msgid "Use current page as homepage" -msgstr "" +msgstr "השתמש בדף הנוכחי כדף הבית" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:351 +#: ../panels/midori-transfers.c:88 msgid "Transfers" -msgstr "" +msgstr "העברות" #. Page "Appearance" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:366 msgid "Appearance" -msgstr "" +msgstr "מראה" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:367 msgid "Font settings" -msgstr "" +msgstr "הגדרות גופן" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" -msgstr "" +msgstr "משפחת גופנים ברירת מחדל" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:372 +msgid "The default font family used to display text" +msgstr "משפחת גופנים לשימוש כברית המחדל להצגת טקסט" + +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" -msgstr "" +msgstr "גודל גופנים לשימוש כברית המחדל להצגת טקסט" -#: ../midori/midori-preferences.c:473 -msgid "Minimum Font Size" -msgstr "" +#: ../midori/midori-preferences.c:377 +msgid "Fixed-width Font Family" +msgstr "משפחת גופנית עם רוחב קבוע" -#: ../midori/midori-preferences.c:476 -msgid "The minimum font size used to display text" -msgstr "" +#: ../midori/midori-preferences.c:380 +msgid "The font family used to display fixed-width text" +msgstr "משפחת גופנים לשימוש בהצגת טקסט בעל רוחב קבוע" -#: ../midori/midori-preferences.c:483 -msgid "Encoding" -msgstr "" +#: ../midori/midori-preferences.c:383 +msgid "The font size used to display fixed-width text" +msgstr "גודל גופנים לשימוש בהצגת טקסט בעל רוחב קבוע" -#: ../midori/midori-preferences.c:486 -msgid "The character encoding to use by default" -msgstr "" +#: ../midori/midori-preferences.c:385 +msgid "Minimum Font Size" +msgstr "גודל גון מינימלי" + +#: ../midori/midori-preferences.c:388 +msgid "The minimum font size used to display text" +msgstr "משפחת גופנים המינימלי לשימוש בהצגת טקסט" #. Page "Behavior" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:397 msgid "Behavior" -msgstr "" - -#: ../midori/midori-preferences.c:494 -msgid "Features" -msgstr "" - -#: ../midori/midori-preferences.c:497 ../extensions/statusbar-features.c:51 -msgid "Load images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:498 -msgid "Load and display images automatically" -msgstr "" +msgstr "התנהגות" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:410 msgid "Shrink images automatically" -msgstr "" +msgstr "כווץ תמונות אוטומטית" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:411 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:505 -msgid "Print background images" -msgstr "" - -#: ../midori/midori-preferences.c:506 -msgid "Whether background images should be printed" -msgstr "" - -#: ../midori/midori-preferences.c:509 -msgid "Resizable text areas" -msgstr "" - -#: ../midori/midori-preferences.c:510 -msgid "Whether text areas are resizable" -msgstr "" - -#: ../midori/midori-preferences.c:513 ../extensions/statusbar-features.c:58 -msgid "Enable scripts" -msgstr "" - -#: ../midori/midori-preferences.c:514 -msgid "Enable embedded scripting languages" -msgstr "" - -#: ../midori/midori-preferences.c:517 ../extensions/statusbar-features.c:65 -msgid "Enable plugins" -msgstr "" - -#: ../midori/midori-preferences.c:518 -msgid "Enable embedded plugin objects" -msgstr "" - -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:423 msgid "Enforce 96 dots per inch" -msgstr "" +msgstr "הכרח 96 נקודות לאינץ'" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:424 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:427 msgid "Enable developer tools" -msgstr "" +msgstr "הפעל כלי מפתח" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:428 msgid "Enable special extensions for developers" -msgstr "" +msgstr "הפעלת הרחבות מיוחדות עבור מפתחים" + +#: ../midori/midori-preferences.c:438 +msgid "Spell Checking" +msgstr "בדיקת איות" + +#: ../midori/midori-preferences.c:440 +msgid "Enable Spell Checking" +msgstr "הפעל בדיקת איות" + +#: ../midori/midori-preferences.c:441 +msgid "Enable spell checking while typing" +msgstr "הפעל בדיקת איות תוך כדי הקלדה" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:445 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "רשימה המופרדת בפסיקים עבור שפות לשימוש בבדיקת איות, לדוגמה \"en_US,he_IL\"" #. Page "Interface" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:453 msgid "Interface" -msgstr "" +msgstr "מנשק" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:454 msgid "Navigationbar" -msgstr "" +msgstr "סרגל ניווט" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:464 msgid "Browsing" -msgstr "" +msgstr "גלישה" + +#. Page "Applications" +#: ../midori/midori-preferences.c:486 +msgid "Applications" +msgstr "יישומים" + +#: ../midori/midori-preferences.c:487 +msgid "External applications" +msgstr "יישומים חיצוניים" #. Page "Network" -#: ../midori/midori-preferences.c:578 ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:504 msgid "Network" -msgstr "" - -#: ../midori/midori-preferences.c:606 -msgid "MB" -msgstr "" +msgstr "רשת" #. Page "Privacy" -#: ../midori/midori-preferences.c:611 +#: ../midori/midori-preferences.c:523 msgid "Privacy" -msgstr "" +msgstr "פרטיות" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:524 msgid "Web Cookies" -msgstr "" +msgstr "עוגיות רשת" -#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:635 +#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:542 msgid "days" -msgstr "" +msgstr "ימים" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:488 +#: ../katze/katze-arrayaction.c:334 msgid "Empty" -msgstr "" +msgstr "ריק" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:907 msgid "Add search engine" -msgstr "" +msgstr "הוסף מנוע חיפוש" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:907 msgid "Edit search engine" -msgstr "" +msgstr "ערוך מנוע חיפוש" -#: ../midori/midori-searchaction.c:840 +#: ../midori/midori-searchaction.c:935 msgid "_Name:" -msgstr "" +msgstr "_שם:" -#: ../midori/midori-searchaction.c:884 +#: ../midori/midori-searchaction.c:979 msgid "_Icon:" -msgstr "" +msgstr "_סמל:" -#: ../midori/midori-searchaction.c:898 +#: ../midori/midori-searchaction.c:993 msgid "_Token:" -msgstr "" +msgstr "_אות:" -#: ../midori/midori-searchaction.c:1078 +#: ../midori/midori-searchaction.c:1212 msgid "Manage Search Engines" -msgstr "" +msgstr "ניהול מנועי חיפוש" -#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 -msgid "Could not run external program." -msgstr "" +#: ../midori/midori-searchaction.c:1311 +msgid "Use as _default" +msgstr "קבע כברירת מחדל" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:446 -msgid "Warning: You are using a superuser account!" -msgstr "" - -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:1090 msgid "_Bookmark" -msgstr "" +msgstr "_סימניה" -#: ../midori/sokoke.c:779 -msgid "_Add Bookmark" -msgstr "" +#: ../midori/sokoke.c:1092 +msgid "Add Boo_kmark" +msgstr "הוסף סימ_ניה" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:1093 msgid "_Console" -msgstr "" +msgstr "_מסוף" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:1094 msgid "_Extensions" -msgstr "" +msgstr "_הרחבות" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:1095 msgid "_History" -msgstr "" +msgstr "_היסטוריה" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:1096 msgid "_Homepage" -msgstr "" +msgstr "_דף הבית" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:1097 msgid "_Userscripts" -msgstr "" - -#: ../midori/sokoke.c:785 -msgid "User_styles" -msgstr "" +msgstr "תסריטי _משתמש" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:1098 msgid "New _Tab" -msgstr "" +msgstr "_לשונית חדשה" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:1099 msgid "_Transfers" -msgstr "" - -#: ../midori/sokoke.c:788 -msgid "P_lugins" -msgstr "" +msgstr "_העברות" -#: ../midori/sokoke.c:789 -msgid "_Closed Tabs and Windows" -msgstr "" +#: ../midori/sokoke.c:1100 +msgid "Netscape p_lugins" +msgstr "ת_וספי Netscape" -#: ../midori/sokoke.c:790 -msgid "New _Window" -msgstr "" - -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 +#: ../panels/midori-addons.c:139 msgid "Userscripts" -msgstr "" +msgstr "תסריטי משתמש" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" -msgstr "" - -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "" +msgstr "עיצובי משתמש" -#: ../panels/midori-addons.c:924 ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "" - -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "העתק את תסריטי המשתמש לתיקייה %s ואת עיצובי המשתמש לתיקייה %s." -#: ../panels/midori-addons.c:934 ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "" +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "לא ניתן לנתר אחר התיקייה '%s': ‏%s" -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" -msgstr "" +msgstr "סימניות" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:243 msgid "Edit the selected bookmark" -msgstr "" +msgstr "ערוך את הסימנייה הנבחרת" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:251 msgid "Delete the selected bookmark" -msgstr "" +msgstr "מחק את הסימנייה הנבחרת" + +#: ../panels/midori-bookmarks.c:264 +msgid "Add a new folder" +msgstr "הוסף תיקייה חדשה" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:594 msgid "Separator" -msgstr "" +msgstr "מפריד" #: ../panels/midori-console.c:87 msgid "Console" -msgstr "" +msgstr "מסוף" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" -msgstr "" +msgstr "הרחבות" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "האם אתה בטוח שברצונך להסיר את כל פרטי ההיסטוריה?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" -msgstr "" +msgstr "הוסף לסימניות את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" -msgstr "" +msgstr "מחק את פריט ההיסטוריה הנבחר" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" -msgstr "" +msgstr "נקה את כל ההיסטוריה" -#: ../panels/midori-history.c:600 -#, c-format +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "זמן השעון שגוי" + +#: ../panels/midori-history.c:599 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "הזמן השעון נמצא בעבר. לא לבדוק את הזמן והתאריך הנוכחיים." + +#: ../panels/midori-history.c:611 msgid "A week ago" -msgstr "" +msgstr "לפני שבוע" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format -msgid "%d days ago" -msgstr "" +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "לפני יום" +msgstr[1] "לפני %d ימים" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:624 msgid "Today" -msgstr "" +msgstr "היום" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:626 msgid "Yesterday" -msgstr "" +msgstr "אתמול" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 -msgid "Plugins" -msgstr "" +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "תוספי Netscape" -#: ../panels/midori-transfers.c:256 -#, c-format -msgid "%s of %s" -msgstr "" +#: ../panels/midori-transfers.c:480 +msgid "Open Destination _Folder" +msgstr "פתח _תיקיית יעד" -#: ../katze/katze-http-auth.c:97 +#: ../panels/midori-transfers.c:483 +msgid "Copy Link Loc_ation" +msgstr "העתק את כתו_בת הקישור" + +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" -msgstr "" +msgstr "נדרש אימות" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"נדרש שם משתמש וסיסמה\n" +"כדי לגשת לכתובת זו:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" -msgstr "" +msgstr "שם משתמש" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" -msgstr "" +msgstr "סיסמה" + +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "_זכור סיסמה" #: ../katze/katze-throbber.c:828 #, c-format @@ -1666,36 +2102,93 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:483 +#: ../katze/katze-utils.c:862 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:529 +#: ../katze/katze-utils.c:558 msgid "Choose file" -msgstr "" +msgstr "בחר קובץ" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:544 msgid "Choose folder" -msgstr "" +msgstr "בחר תיקייה" -#: ../extensions/colorful-tabs.c:104 -msgid "Tint tabs distinctly" -msgstr "" +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "מאפיינים עבור %s" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/adblock.c:373 +msgid "Configure Advertisement filters" +msgstr "הגדרת מסנני פרסומות" + +#: ../extensions/adblock.c:403 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "הכנס את הכתובת של רשימת מסננים מוגדרת מראש ולחץ על \"הוסף\". ניתן למצוא רשימות נוספות בכתובת %s." + +#: ../extensions/adblock.c:543 +msgid "Configure _Advertisement filters..." +msgstr "הגדרת מסנני _פרסומות..." + +#: ../extensions/adblock.c:1099 +msgid "Advertisement blocker" +msgstr "חוסם פרסומות" + +#: ../extensions/adblock.c:1100 +msgid "Block advertisements according to a filter list" +msgstr "חסימת פרסומות בעזרת רשימת מסננים" + +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" -msgstr "" +msgstr "לשוניות צבעוניות" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" -msgstr "" +msgstr "צבע לשוניות בצבעים שונים" -#: ../extensions/cookie-manager.c:185 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "מנהל עוגיות" + +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "מחק הכל" + +#: ../extensions/cookie-manager/cookie-manager-page.c:111 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "מוח את כל העוגיות. אם נקבע מסנן, ימחקו רק העוגיות שתואמות למסנן." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "הרחב הכל" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "כווץ הכל" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "האם באמת ברצונך למחוק את כל העוגיות?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "שאלה" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "רק עוגיות שיתאימו למסנן ימחקו." + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" -msgstr "" +msgstr "בסיום ההפעלה" -#: ../extensions/cookie-manager.c:188 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1705,101 +2198,296 @@ msgid "" "Secure: %s\n" "Expires: %s" msgstr "" +"מארח: %s\n" +"שם: %s\n" +"ערך: %s\n" +"נטיב: %s\n" +"מאובטח: %s\n" +"תפוגה: %s" -#: ../extensions/cookie-manager.c:194 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" -msgstr "" +msgstr "כן" -#: ../extensions/cookie-manager.c:194 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" -msgstr "" - -#: ../extensions/cookie-manager.c:475 -msgid "Do you really want to delete all cookies?" -msgstr "" - -#: ../extensions/cookie-manager.c:477 -msgid "Question" -msgstr "" +msgstr "לא" -#: ../extensions/cookie-manager.c:485 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." -msgstr "" - -#: ../extensions/cookie-manager.c:663 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" -msgstr "" +msgstr "שם" -#: ../extensions/cookie-manager.c:723 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" -msgstr "" +msgstr "_הרחב הכל" -#: ../extensions/cookie-manager.c:731 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" -msgstr "" +msgstr "_כווץ הכל" -#: ../extensions/cookie-manager.c:800 -msgid "Delete All" -msgstr "" +#: ../extensions/cookie-manager/cookie-manager-page.c:923 +msgid "Filter:" +msgstr "מסנן:" -#: ../extensions/cookie-manager.c:802 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "הזן מחרוזת סינון כדי להציג עוגיות ששמם או שם המתחם שלהם תואמים למסנן שהוזן" -#: ../extensions/cookie-manager.c:817 -msgid "Expand All" -msgstr "" +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "מנהל _עוגיות" -#: ../extensions/cookie-manager.c:824 -msgid "Collapse All" +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "מיין, הצג ומחק עוגיות" + +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "‏DNS מסודר מראש" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "קבל מראש כתובות IP של קישורים במעבר עכבר" + +#: ../extensions/feed-panel/feed-atom.c:237 +msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" -#: ../extensions/cookie-manager.c:855 -msgid "Filter:" +#: ../extensions/feed-panel/feed-atom.c:343 +msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" -#: ../extensions/cookie-manager.c:860 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "עודכן לאחרונה: %s." + +#: ../extensions/feed-panel/feed-panel.c:667 +msgid "Feeds" +msgstr "הזנות" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Add new feed" +msgstr "הוסף הזנה חדשה" + +#: ../extensions/feed-panel/feed-panel.c:727 +msgid "Delete feed" +msgstr "מחק הזנה" + +#: ../extensions/feed-panel/feed-panel.c:810 +msgid "_Feeds" +msgstr "_הזנות" + +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." msgstr "" -#: ../extensions/cookie-manager.c:895 ../extensions/cookie-manager.c:942 -msgid "Cookie Manager" +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "סוג ההזנה לא נתמך." + +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "נכשל בפתיחת הזנת ‏XML‏: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." msgstr "" -#: ../extensions/cookie-manager.c:926 -msgid "_Cookie Manager" +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "נמצא גרסת RSS שלא נתמכת." + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." msgstr "" -#: ../extensions/cookie-manager.c:943 -msgid "List, view and delete cookies" +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "שגיאה" + +#: ../extensions/feed-panel/main.c:126 +#, c-format +msgid "Feed '%s' already exists" +msgstr "ההזנה '%s' כבר קיימת" + +#: ../extensions/feed-panel/main.c:203 +#, c-format +msgid "Error loading feed '%s'" +msgstr "שגיאה בטעינת '%s'" + +#: ../extensions/feed-panel/main.c:514 +msgid "Feed Panel" +msgstr "סרגל ההזנות" + +#: ../extensions/feed-panel/main.c:515 +msgid "Read Atom/ RSS feeds" +msgstr "קריאת הזנות Atom/RSS" + +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "כשל בהוספת ערכת השדה: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "מאחסון היסטוריה של נתונים שהוכנסו בטפסים" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "לא זמין: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "קבצי משאבים לא הותקנו" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "ממלא היסטוריית טפסים" + +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" -msgstr "" +msgstr "מחוות עכבר" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "שליטה ב־Midori בעזרת העכבר" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "מחזיק עמודים" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "" +msgstr "_מחזיק עמודים" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "השאר דף אחר או יותר פתוחים במקביל ללשוניות שלך" -#: ../extensions/statusbar-features.c:49 +#: ../extensions/shortcuts.c:173 +msgid "Customize Keyboard shortcuts" +msgstr "התאמת קיצורי מקלדת" + +#: ../extensions/shortcuts.c:265 +msgid "Customize Sh_ortcuts..." +msgstr "התאמת קי_צורים..." + +#: ../extensions/shortcuts.c:304 +msgid "Shortcuts" +msgstr "קיצורים" + +#: ../extensions/shortcuts.c:305 +msgid "View and edit keyboard shortcuts" +msgstr "הצגה ועריכה של קיצורי מקלדת" + +#: ../extensions/statusbar-features.c:84 msgid "Images" -msgstr "" +msgstr "תמונות" -#: ../extensions/statusbar-features.c:56 +#: ../extensions/statusbar-features.c:96 msgid "Scripts" -msgstr "" +msgstr "תסריטים" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "תכונות שורת מצב" + +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "הפעל או כבה בקלות תכונות של דפי אינטרנט" + +#: ../extensions/tab-panel.c:565 +#: ../extensions/tab-panel.c:622 +msgid "Tab Panel" +msgstr "סרגל לשוניות" + +#: ../extensions/tab-panel.c:606 +msgid "T_ab Panel" +msgstr "סרגל ל_שוניות" + +#: ../extensions/tab-panel.c:623 +msgid "Show tabs in a vertical panel" +msgstr "הצג לשוניות בסרגל אנכי" + +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "רשימת היסטוריית לשוניות" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "מאפשר להחליף לשוניות על ידי בחירה מרשימה הממוינת על ידי שימוש אחרון" + +#: ../extensions/toolbar-editor.c:391 +msgid "Customize Toolbar" +msgstr "התאמת סרגל הכלים" + +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "בחר פריטים להצגה בסרגל הכלים. ניתן לסדר פריטים מחדש על ידי גרירתם." + +#: ../extensions/toolbar-editor.c:423 +msgid "Available Items" +msgstr "פריטים זמינים" + +#: ../extensions/toolbar-editor.c:444 +msgid "Displayed Items" +msgstr "פריטים מוצגים" + +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "התאמת _סרגל הכלים..." + +#: ../extensions/toolbar-editor.c:612 +msgid "Toolbar Editor" +msgstr "עורך סרגל כלים" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "ערוך בקלות את מבנה סגרל הכלים" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "לא זמין על פלטפורמה זו" + +#: ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "מטמון רשת" + +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "אגירת נתוני תקשורת HTTP על הכונן" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "צביעת לשונית בצבעים שונים" +#~ msgid "_Quick Find" +#~ msgstr "חיפוש מהיר" +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "קופץ במהירות אל מילה או ביטוי" +#~ msgid "Last open pages" +#~ msgstr "הדפים שנפתחו אחרונים" +#~ msgid "Both" +#~ msgstr "שניהם" +#~ msgid "Load on Startup" +#~ msgstr "טען בהפעלה" +#~ msgid "Remember last form inputs" +#~ msgstr "זכור קלטי הטופס האחרונים" +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "האם לשמור את קלטי הטופס האחרונים" +#~ msgid "Cache size" +#~ msgstr "גדול מטמון" +#~ msgid "The allowed size of the cache" +#~ msgstr "הגודל המותר של המטמון" + diff --git a/po/ja.po b/po/ja.po index d7e10e11..3a5aa19d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-12 22:45+0900\n" -"PO-Revision-Date: 2009-10-12 22:57+0900\n" +"POT-Creation-Date: 2009-11-29 23:28+0900\n" +"PO-Revision-Date: 2009-11-29 23:25+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,12 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1469 -#: ../midori/main.c:1643 -#: ../midori/main.c:1651 -#: ../midori/main.c:1662 -#: ../midori/midori-websettings.c:289 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1479 ../midori/main.c:1675 +#: ../midori/main.c:1683 ../midori/main.c:1694 +#: ../midori/midori-websettings.c:292 msgid "Midori" msgstr "Midori" @@ -33,1521 +30,1578 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:102 +#: ../midori/main.c:97 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:157 +#: ../midori/main.c:152 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:164 -#: ../midori/main.c:245 +#: ../midori/main.c:159 ../midori/main.c:240 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:369 +#: ../midori/main.c:364 ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:401 +#: ../midori/main.c:396 ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:455 +#: ../midori/main.c:450 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:479 +#: ../midori/main.c:474 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:502 -#: ../midori/main.c:536 -#: ../midori/main.c:552 +#: ../midori/main.c:497 ../midori/main.c:531 ../midori/main.c:547 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:731 +#: ../midori/main.c:726 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:760 +#: ../midori/main.c:755 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:798 +#: ../midori/main.c:793 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:817 -#: ../midori/main.c:845 -#: ../midori/main.c:874 +#: ../midori/main.c:812 ../midori/main.c:840 ../midori/main.c:869 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:897 -#: ../midori/main.c:920 +#: ../midori/main.c:892 ../midori/main.c:915 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:988 -#: ../midori/main.c:1160 +#: ../midori/main.c:984 ../midori/main.c:1156 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1189 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションのいずれかを試してみてください。" +#: ../midori/main.c:1194 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" +"い。" -#: ../midori/main.c:1204 +#: ../midori/main.c:1209 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1208 +#: ../midori/main.c:1213 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1213 +#: ../midori/main.c:1218 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1369 -#: ../midori/main.c:1870 +#: ../midori/main.c:1383 ../midori/main.c:1894 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1469 +#: ../midori/main.c:1479 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1492 +#: ../midori/main.c:1502 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1524 +#: ../midori/main.c:1534 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1575 +#: ../midori/main.c:1594 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1575 +#: ../midori/main.c:1594 msgid "FOLDER" msgstr "FOLDER" # CLI --help -#: ../midori/main.c:1577 +#: ../midori/main.c:1597 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1580 +#: ../midori/main.c:1600 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1583 +#: ../midori/main.c:1603 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI --help -#: ../midori/main.c:1585 +#: ../midori/main.c:1605 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1587 +#: ../midori/main.c:1607 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1640 +#: ../midori/main.c:1672 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1663 +#: ../midori/main.c:1695 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1665 +#: ../midori/main.c:1697 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1745 +#: ../midori/main.c:1767 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1793 +#: ../midori/main.c:1815 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1861 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1879 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1883 +#: ../midori/main.c:1907 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1896 +#: ../midori/main.c:1920 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1908 +#: ../midori/main.c:1932 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1924 +#: ../midori/main.c:1948 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-array.c:251 +#: ../midori/midori-array.c:330 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:260 -#: ../midori/midori-array.c:270 +#: ../midori/midori-array.c:361 ../midori/midori-array.c:384 +#: ../midori/midori-array.c:394 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:437 -#: ../midori/sokoke.c:798 +#: ../midori/midori-array.c:403 +msgid "Unrecognized bookmark format." +msgstr "認識できないブックマーク形式です。" + +#: ../midori/midori-array.c:567 ../midori/sokoke.c:955 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:310 -#: ../midori/midori-browser.c:4530 -#: ../midori/midori-browser.c:4536 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4926 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:321 -#: ../midori/midori-browser.c:4533 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4923 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:416 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:441 +#: ../midori/midori-browser.c:478 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:679 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:679 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:711 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:683 -#: ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:724 ../midori/midori-searchaction.c:967 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:702 -#: ../midori/midori-searchaction.c:966 +#: ../midori/midori-browser.c:743 ../midori/midori-searchaction.c:981 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:725 +#: ../midori/midori-browser.c:773 ../midori/midori-browser.c:4193 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:730 -#: ../midori/midori-browser.c:771 +#: ../midori/midori-browser.c:783 ../midori/midori-browser.c:859 +#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4229 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:849 +#: ../midori/midori-browser.c:812 +msgid "Show in the tool_bar" +msgstr "ツールバーに表示する(_B)" + +#: ../midori/midori-browser.c:827 +msgid "Run as _web application" +msgstr "ウェブアプリケーションとして実行する(_W)" + +#: ../midori/midori-browser.c:935 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1226 -#: ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:1302 ../panels/midori-transfers.c:272 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../midori/midori-browser.c:1263 +#: ../midori/midori-browser.c:1338 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../midori/midori-browser.c:1267 +#: ../midori/midori-browser.c:1342 msgid "Transfer completed" msgstr "転送完了" -#: ../midori/midori-browser.c:1408 +#: ../midori/midori-browser.c:1482 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2069 +#: ../midori/midori-browser.c:2181 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:3419 -#: ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2257 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "新しいフィード" -#: ../midori/midori-browser.c:3674 -#: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +# tooltip +#: ../midori/midori-browser.c:2290 ../midori/midori-browser.c:4979 +#: ../panels/midori-bookmarks.c:235 +msgid "Add a new bookmark" +msgstr "新しいブックマークを追加します" + +#: ../midori/midori-browser.c:3442 ../midori/sokoke.c:275 +#: ../midori/sokoke.c:285 ../midori/sokoke.c:313 ../midori/sokoke.c:335 +#: ../midori/sokoke.c:349 +msgid "Could not run external program." +msgstr "外部プログラムを実行できませんでした。" + +#: ../midori/midori-browser.c:3937 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:3681 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3944 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:3684 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3947 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" +#: ../midori/midori-browser.c:4126 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4127 +msgid "Kazehakase" +msgstr "風博士" + +#: ../midori/midori-browser.c:4128 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4148 +msgid "Import bookmarks..." +msgstr "ブックマークのインポート..." + +#: ../midori/midori-browser.c:4151 ../midori/midori-browser.c:4984 +msgid "_Import bookmarks" +msgstr "ブックマークのインポート(_I)" + +#: ../midori/midori-browser.c:4162 +msgid "_Application:" +msgstr "アプリケーション(_A):" + +#: ../midori/midori-browser.c:4248 +msgid "Failed to import bookmarks" +msgstr "ブックマークのインポートに失敗しました" + # Dialog title -#: ../midori/midori-browser.c:3994 +#: ../midori/midori-browser.c:4388 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:3998 +#: ../midori/midori-browser.c:4392 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4011 +#: ../midori/midori-browser.c:4405 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4021 -#: ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:4415 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:108 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:4026 +#: ../midori/midori-browser.c:4420 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4031 +#: ../midori/midori-browser.c:4425 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4430 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:4041 -#: ../midori/sokoke.c:971 +#: ../midori/midori-browser.c:4435 ../midori/sokoke.c:1114 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:4049 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4145 +#: ../midori/midori-browser.c:4539 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:4161 +#: ../midori/midori-browser.c:4555 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4837 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:4458 -#: ../midori/sokoke.c:972 +#: ../midori/midori-browser.c:4839 ../midori/sokoke.c:1115 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4840 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:4462 +#: ../midori/midori-browser.c:4843 msgid "Open a new tab" msgstr "新しいタブを開きます" # tooltip -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4846 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:4468 +#: ../midori/midori-browser.c:4849 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4851 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:4471 +#: ../midori/midori-browser.c:4852 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:4473 +#: ../midori/midori-browser.c:4854 +msgid "Add Shortcut to the _desktop" +msgstr "デスクトップにショートカットを追加(_D)" + +# tooltip +#: ../midori/midori-browser.c:4855 +msgid "Add shortcut to the desktop" +msgstr "デスクトップにショートカットを追加します" + +#: ../midori/midori-browser.c:4857 +msgid "Subscribe to News _feed" +msgstr "ニュースフィードを購読(_F)" + +#: ../midori/midori-browser.c:4858 +msgid "Subscribe to this news feed" +msgstr "このニュースフィードを購読します" + +#: ../midori/midori-browser.c:4863 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4864 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:4476 +#: ../midori/midori-browser.c:4866 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4867 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4870 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:4483 +#: ../midori/midori-browser.c:4873 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4875 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:4489 +#: ../midori/midori-browser.c:4879 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4882 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:4496 +#: ../midori/midori-browser.c:4886 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:4499 -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4889 ../midori/midori-browser.c:4892 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:4505 +#: ../midori/midori-browser.c:4895 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4898 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:4511 +#: ../midori/midori-browser.c:4901 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4904 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:4516 +#: ../midori/midori-browser.c:4906 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4907 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:4519 +#: ../midori/midori-browser.c:4909 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4910 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:4524 +#: ../midori/midori-browser.c:4914 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:4526 +#: ../midori/midori-browser.c:4916 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:4527 +#: ../midori/midori-browser.c:4917 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:4539 +#: ../midori/midori-browser.c:4933 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:4542 +#: ../midori/midori-browser.c:4940 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:4545 +#: ../midori/midori-browser.c:4943 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:4546 +#: ../midori/midori-browser.c:4944 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:4548 +#: ../midori/midori-browser.c:4946 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:4549 +#: ../midori/midori-browser.c:4947 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:4551 +#: ../midori/midori-browser.c:4949 msgid "View Selection Source" msgstr "選択領域のソースを表示" # tooltip -#: ../midori/midori-browser.c:4552 +#: ../midori/midori-browser.c:4950 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" # tooltip -#: ../midori/midori-browser.c:4556 +#: ../midori/midori-browser.c:4958 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:4558 +#: ../midori/midori-browser.c:4960 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:4561 +#: ../midori/midori-browser.c:4963 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:4564 +#: ../midori/midori-browser.c:4966 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4969 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:4569 +#: ../midori/midori-browser.c:4971 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4972 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4974 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4975 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -# tooltip -#: ../midori/midori-browser.c:4577 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "新しいブックマークを追加します" - -#: ../midori/midori-browser.c:4579 +#: ../midori/midori-browser.c:4981 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:4580 +#: ../midori/midori-browser.c:4982 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:4582 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4987 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:4583 +#: ../midori/midori-browser.c:4988 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:4586 +#: ../midori/midori-browser.c:4991 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:4587 +#: ../midori/midori-browser.c:4992 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:4591 +#: ../midori/midori-browser.c:4996 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:4592 +#: ../midori/midori-browser.c:4997 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4999 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:5000 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:5002 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:5003 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:4600 +#: ../midori/midori-browser.c:5005 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:4601 +#: ../midori/midori-browser.c:5006 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:4603 +#: ../midori/midori-browser.c:5008 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:4605 +#: ../midori/midori-browser.c:5010 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:5011 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:4608 +#: ../midori/midori-browser.c:5013 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:5014 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:5016 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:4612 +#: ../midori/midori-browser.c:5017 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:4615 +#: ../midori/midori-browser.c:5020 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:5027 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:5028 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" -#: ../midori/midori-browser.c:4628 +#: ../midori/midori-browser.c:5033 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:4629 +#: ../midori/midori-browser.c:5034 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:5037 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:4633 +#: ../midori/midori-browser.c:5038 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:4636 +#: ../midori/midori-browser.c:5041 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:5042 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:4640 +#: ../midori/midori-browser.c:5045 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:4641 +#: ../midori/midori-browser.c:5046 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:5049 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:5050 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:4648 +#: ../midori/midori-browser.c:5053 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:5054 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:5061 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:4659 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:217 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4663 +#: ../midori/midori-browser.c:5068 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:4666 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5071 ../midori/midori-websettings.c:219 +msgid "Korean (EUC-KR)" +msgstr "韓国語 (EUC-KR)" + +#: ../midori/midori-browser.c:5074 ../midori/midori-websettings.c:220 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:4669 -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:5077 ../midori/midori-websettings.c:221 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4672 -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5080 ../midori/midori-websettings.c:222 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:4675 -#: ../midori/midori-websettings.c:221 -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-browser.c:5083 ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:5633 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5640 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5642 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5666 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:5668 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:5215 +#: ../midori/midori-browser.c:5689 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:5704 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" # tooltip -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5706 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:5247 -#: ../midori/sokoke.c:961 +#: ../midori/midori-browser.c:5721 ../midori/sokoke.c:1104 msgid "_Bookmarks" msgstr "ブックマーク(_B)" # tooltip -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5723 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:5264 +#: ../midori/midori-browser.c:5738 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5750 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5752 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5766 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5768 msgid "Menu" msgstr "メニュー" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5971 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:6002 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:6007 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:6012 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:6021 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:6033 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:5565 -#: ../panels/midori-transfers.c:143 +#: ../midori/midori-browser.c:6079 ../panels/midori-transfers.c:143 msgid "Clear All" msgstr "すべてクリア" -#: ../midori/midori-browser.c:5919 +#: ../midori/midori-browser.c:6446 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-locationaction.c:968 +#: ../midori/midori-locationaction.c:974 #, c-format msgid "Search with %s" msgstr "%s で検索" -#: ../midori/midori-panel.c:381 -#: ../midori/midori-panel.c:383 +#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 msgid "Detach chosen panel from the window" msgstr "選択したパネルをウィンドウから切り離す" -#: ../midori/midori-panel.c:393 -#: ../midori/midori-panel.c:395 -#: ../midori/midori-panel.c:576 -#: ../midori/midori-panel.c:579 +#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 +#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 msgid "Align sidepanel to the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:405 -#: ../midori/midori-panel.c:406 +#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置する" -#: ../midori/midori-panel.c:703 +#: ../midori/midori-panel.c:722 msgid "Show panel _titles" msgstr "パネルタイトルの表示(_T)" -#: ../midori/midori-panel.c:711 +#: ../midori/midori-panel.c:729 msgid "Show operating _controls" msgstr "操作コントロールの表示(_C)" -#: ../midori/midori-panel.c:782 +#: ../midori/midori-panel.c:834 msgid "Options" msgstr "オプション" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "空白ページを表示" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:218 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 +msgid "Small icons" +msgstr "小さいアイコン" + +#: ../midori/midori-websettings.c:258 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:259 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:260 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:275 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:276 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:274 -#: ../panels/midori-addons.c:93 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:277 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:648 ../extensions/shortcuts.c:94 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:294 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:295 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:296 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:349 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:350 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:358 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:359 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:367 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:368 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:393 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:394 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:403 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:404 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:412 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:413 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:422 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:431 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:440 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:449 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:465 msgid "Show Transferbar" msgstr "転送バーを表示する" # tooltip -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:485 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" # tooltip -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:517 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" # tooltip -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:518 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:526 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:527 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:535 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:536 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:551 msgid "Show operating controls of the panel" msgstr "パネルの操作コントロールを表示する" # tooltip -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:552 msgid "Whether to show the operating controls of the panel" msgstr "パネルに操作コントロールを表示します" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:567 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:568 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:583 +msgid "Open panels in separate windows" +msgstr "パネルを別のウィンドウで開く" + +# tooltip +#: ../midori/midori-websettings.c:584 +msgid "Whether to always open panels in separate windows" +msgstr "パネルを常に別のウィンドウで開きます" + +#: ../midori/midori-websettings.c:593 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:603 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:604 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:619 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:620 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:636 msgid "Show speed dial in new tabs" msgstr "新しいタブにスピードダイアルを表示する" # tooltip -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:637 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:645 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:646 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:667 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" # tooltip -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:668 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:687 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" # tooltip -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:688 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:700 msgid "Download Manager" msgstr "ダウンロードマネージャ" # tooltip -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:701 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:709 msgid "Text Editor" msgstr "テキストエディタ" # tooltip -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:710 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:725 msgid "News Aggregator" msgstr "フィードリーダ" # tooltip -#: ../midori/midori-websettings.c:707 +#: ../midori/midori-websettings.c:726 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:734 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:716 +#: ../midori/midori-websettings.c:735 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:743 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:744 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:754 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:763 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:772 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:782 msgid "Open external pages in:" msgstr "外部ページを開く時:" # tooltip -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:783 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:792 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:793 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:801 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:802 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:810 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:811 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:819 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:820 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:817 +#: ../midori/midori-websettings.c:830 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "画像を自動的に読み込む" + +# tooltip +#: ../midori/midori-websettings.c:831 +msgid "Load and display images automatically" +msgstr "画像を自動的に読み込んで表示します" + +#: ../midori/midori-websettings.c:838 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "スクリプトを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:839 +msgid "Enable embedded scripting languages" +msgstr "組み込みスクリプト言語を有効にします" + +#: ../midori/midori-websettings.c:846 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Netscape プラグインを有効にする" + +# tooltip +#: ../midori/midori-websettings.c:847 +msgid "Enable embedded Netscape plugin objects" +msgstr "組み込み Netscape プラグインオブジェクトを有効にします" + +#: ../midori/midori-websettings.c:862 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:863 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:878 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:879 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:894 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:850 +#: ../midori/midori-websettings.c:895 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:903 msgid "Accept cookies" msgstr "Cookie の受け入れ" # tooltip -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:904 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:913 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" # tooltip -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:914 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:922 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:878 +#: ../midori/midori-websettings.c:923 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:940 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" # tooltip -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:941 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:949 msgid "Maximum history age" msgstr "履歴の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:950 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:906 -msgid "Remember last form inputs" -msgstr "最後のフォーム入力を記憶する" - -# tooltip -#: ../midori/midori-websettings.c:907 -msgid "Whether the last form inputs are saved" -msgstr "最後にフォーム入力した内容を記憶します" - -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:958 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" # tooltip -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:959 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:969 msgid "Proxy Server" msgstr "プロキシサーバ" # tooltip -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:970 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:985 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" # tooltip -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:986 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:977 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:985 -msgid "Cache size" -msgstr "キャッシュサイズ" - -# tooltip -#: ../midori/midori-websettings.c:986 -msgid "The allowed size of the cache" -msgstr "キャッシュのサイズを指定します" - # Button title -#: ../midori/midori-websettings.c:1001 +#: ../midori/midori-websettings.c:1035 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:1036 msgid "The private data selected for deletion" msgstr "選択されているプライベートデータを削除します" @@ -1555,486 +1609,418 @@ msgstr "選択されているプライベートデータを削除します" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:847 -#: ../midori/midori-view.c:3643 -#: ../midori/midori-view.c:3647 +#: ../midori/midori-view.c:915 ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3824 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:848 +#: ../midori/midori-view.c:916 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:853 +#: ../midori/midori-view.c:921 msgid "Try again" msgstr "再試行" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:886 +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:1100 -#: ../midori/midori-view.c:1813 +#: ../midori/midori-view.c:1168 ../midori/midori-view.c:1904 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:1652 -#: ../midori/midori-view.c:1715 +#: ../midori/midori-view.c:1731 ../midori/midori-view.c:1799 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:1655 -#: ../midori/midori-view.c:1717 +#: ../midori/midori-view.c:1734 ../midori/midori-view.c:1801 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1658 -#: ../midori/midori-view.c:1724 +#: ../midori/midori-view.c:1738 +msgid "Open Link in _Foreground Tab" +msgstr "リンクをフォアグラウンドのタブで開く(_T)" + +#: ../midori/midori-view.c:1739 +msgid "Open Link in _Background Tab" +msgstr "リンクをバックグラウンドのタブで開く(_T)" + +#: ../midori/midori-view.c:1742 ../midori/midori-view.c:1808 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1745 msgid "_Copy Link destination" msgstr "リンク先をコピー(_C)" -#: ../midori/midori-view.c:1664 -#: ../midori/midori-view.c:1736 +#: ../midori/midori-view.c:1748 ../midori/midori-view.c:1820 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1665 -#: ../midori/midori-view.c:1730 +#: ../midori/midori-view.c:1749 ../midori/midori-view.c:1814 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1669 -#: ../midori/midori-view.c:1705 -#: ../midori/midori-view.c:1741 +#: ../midori/midori-view.c:1753 ../midori/midori-view.c:1789 +#: ../midori/midori-view.c:1825 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:1681 +#: ../midori/midori-view.c:1765 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:1684 -msgid "Open _Image in New Window" -msgstr "画像を新しいウィンドウで開く(_I)" +#: ../midori/midori-view.c:1768 +msgid "Open Image in New Wi_ndow" +msgstr "画像を新しいウィンドウで開く(_N)" -#: ../midori/midori-view.c:1687 +#: ../midori/midori-view.c:1771 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:1690 +#: ../midori/midori-view.c:1774 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:1691 +#: ../midori/midori-view.c:1775 msgid "Download I_mage" msgstr "画像をダウンロード(_M)" -#: ../midori/midori-view.c:1698 +#: ../midori/midori-view.c:1782 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:1701 +#: ../midori/midori-view.c:1785 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:1701 +#: ../midori/midori-view.c:1785 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:1761 +#: ../midori/midori-view.c:1845 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:1789 -#: ../midori/midori-view.c:1800 +#: ../midori/midori-view.c:1880 ../midori/midori-view.c:1891 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1821 +#: ../midori/midori-view.c:1912 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2030 +#: ../midori/midori-view.c:2179 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2047 +#: ../midori/midori-view.c:2202 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2050 +#: ../midori/midori-view.c:2205 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2054 +#: ../midori/midori-view.c:2209 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:2567 +#: ../midori/midori-view.c:2725 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:2766 +#: ../midori/midori-view.c:2943 msgid "Speed dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:2767 +#: ../midori/midori-view.c:2944 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:2768 +#: ../midori/midori-view.c:2945 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:2769 +#: ../midori/midori-view.c:2946 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:2770 +#: ../midori/midori-view.c:2947 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:2977 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:2817 +#: ../midori/midori-view.c:2994 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:2942 +#: ../midori/midori-view.c:3121 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:3171 -#: ../midori/sokoke.c:968 -msgid "New _Tab" -msgstr "新しいタブ(_T)" - -#: ../midori/midori-view.c:3185 +#: ../midori/midori-view.c:3364 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:3369 msgid "_Restore Tab" msgstr "タブの復元(_R)" -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:3369 msgid "_Minimize Tab" msgstr "タブの最小化(_M)" -#: ../midori/midori-view.c:3749 +#: ../midori/midori-view.c:3926 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:3750 +#: ../midori/midori-view.c:3927 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:3794 -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-view.c:3971 ../midori/midori-preferences.c:398 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "%s の設定" - #. Page "General" -#: ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:318 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:319 msgid "Startup" msgstr "起動" # tooltip -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:334 ../midori/midori-preferences.c:341 msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:431 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:351 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" #. Page "Appearance" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:366 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:367 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" # tooltip -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:372 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:377 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" # tooltip -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:380 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:383 msgid "The font size used to display fixed-width text" msgstr "等幅文字表示で使用するフォントのサイズを指定します" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:385 msgid "Minimum Font Size" msgstr "最小フォントサイズ" # tooltip -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:388 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:478 -msgid "Encoding" -msgstr "エンコーディング" - -# tooltip -#: ../midori/midori-preferences.c:481 -msgid "The character encoding to use by default" -msgstr "デフォルトで使用する文字エンコーディングです" - #. Page "Behavior" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:397 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:492 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "画像を自動的に読み込む" - -# tooltip -#: ../midori/midori-preferences.c:493 -msgid "Load and display images automatically" -msgstr "画像を自動的に読み込んで表示します" - -#: ../midori/midori-preferences.c:501 -msgid "Shrink images automatically" -msgstr "画像を自動的に縮小する" - -# tooltip -#: ../midori/midori-preferences.c:502 -msgid "Automatically shrink standalone images to fit" -msgstr "画像を単独表示するときに自動的に縮小します" - -#: ../midori/midori-preferences.c:509 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "スクリプトを有効にする" - -# tooltip -#: ../midori/midori-preferences.c:510 -msgid "Enable embedded scripting languages" -msgstr "組み込みスクリプト言語を有効にします" - -#: ../midori/midori-preferences.c:513 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Netscape プラグインを有効にする" - -# tooltip -#: ../midori/midori-preferences.c:514 -msgid "Enable embedded Netscape plugin objects" -msgstr "組み込み Netscape プラグインオブジェクトを有効にします" - -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" # tooltip -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" msgstr "開発ツールを有効にする" # tooltip -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" msgstr "スペルチェック" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" msgstr "スペルチェックを有効にする" # tooltip -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" msgstr "キー入力中のスペルチェックを有効にします" # tooltip #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:537 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +#: ../midori/midori-preferences.c:441 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" msgstr "スペルチェックを行う言語をカンマで区切って指定します。例 \"en,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:449 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:460 msgid "Browsing" msgstr "ブラウジング" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "アプリケーション" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "外部アプリケーション" #. Page "Network" -#: ../midori/midori-preferences.c:625 -#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:653 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:519 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:520 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:672 -#: ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:531 ../midori/midori-preferences.c:538 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:335 +#: ../midori/midori-searchaction.c:491 ../katze/katze-arrayaction.c:338 msgid "Empty" msgstr "空です" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:951 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:995 msgid "_Icon:" msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1009 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1228 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1329 msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:166 -#: ../midori/sokoke.c:178 -msgid "Could not run external program." -msgstr "外部プログラムを実行できませんでした。" - -#: ../midori/sokoke.c:960 +#: ../midori/sokoke.c:1103 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:962 +#: ../midori/sokoke.c:1105 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/sokoke.c:963 +#: ../midori/sokoke.c:1106 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:964 +#: ../midori/sokoke.c:1107 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:965 +#: ../midori/sokoke.c:1108 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:966 +#: ../midori/sokoke.c:1109 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:967 +#: ../midori/sokoke.c:1110 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:969 +#: ../midori/sokoke.c:1111 +msgid "New _Tab" +msgstr "新しいタブ(_T)" + +#: ../midori/sokoke.c:1112 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:970 +#: ../midori/sokoke.c:1113 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../panels/midori-addons.c:94 -#: ../panels/midori-addons.c:139 +#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "ユーザスクリプト" @@ -2042,35 +2028,37 @@ msgstr "ユーザスクリプト" msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:287 +#: ../panels/midori-addons.c:294 #, c-format msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "ユーザスクリプトをフォルダ %s へ、ユーザスタイルをフォルダ %s へコピーします。" +msgstr "" +"ユーザスクリプトをフォルダ %s へ、ユーザスタイルをフォルダ %s へコピーしま" +"す。" -#: ../panels/midori-addons.c:889 +#: ../panels/midori-addons.c:896 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "フォルダ '%s' をモニタできません: %s" -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" msgstr "ブックマーク" # tooltip -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:243 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:251 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:264 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:594 msgid "Separator" msgstr "セパレータ" @@ -2101,27 +2089,35 @@ msgstr "選択した履歴アイテムを削除します" msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "時刻の誤り" + +#: ../panels/midori-history.c:599 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "時計時刻が過去になっています。現在の日付と時刻をチェックしてください。" + +#: ../panels/midori-history.c:611 msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" msgstr[1] "%d 日前" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:624 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:626 msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:108 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape プラグイン" @@ -2171,53 +2167,56 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:203 -#: ../katze/katze-utils.c:420 +#: ../katze/katze-utils.c:483 ../katze/katze-utils.c:874 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:238 -#: ../katze/katze-utils.c:267 +#: ../katze/katze-utils.c:529 ../katze/katze-utils.c:558 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:253 +#: ../katze/katze-utils.c:544 msgid "Choose folder" msgstr "フォルダの選択" -#: ../extensions/adblock.c:235 +#: ../katze/katze-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "%s の設定" + +#: ../extensions/adblock.c:373 msgid "Configure Advertisement filters" msgstr "広告フィルタの設定" -#: ../extensions/adblock.c:372 +#: ../extensions/adblock.c:405 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"リストに追加するには、フィルタリストのアドレスを入力し \"追加\" ボタンをク" +"リックしてください。フィルタリストは %s で見つけることができます。" + +#: ../extensions/adblock.c:545 msgid "Configure _Advertisement filters..." msgstr "広告フィルタの設定(_A)..." -#: ../extensions/adblock.c:704 -#, c-format -msgid "Not available: %s required" -msgstr "利用できません: %s が必要です" - -#: ../extensions/adblock.c:709 +#: ../extensions/adblock.c:1101 msgid "Advertisement blocker" msgstr "広告ブロッカ" # description -#: ../extensions/adblock.c:711 +#: ../extensions/adblock.c:1102 msgid "Block advertisements according to a filter list" msgstr "フィルタリストに登録された広告をブロックします" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "タブの色分け" - -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" msgstr "カラフルタブ" # description -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" @@ -2231,8 +2230,12 @@ msgid "Delete All" msgstr "すべて削除" #: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "表示されているすべての cookie を削除します。フィルタが設定されていれば、フィルタにマッチした cookie のみ削除されます。" +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" +"ルタにマッチした cookie のみ削除されます。" # tooltip #: ../extensions/cookie-manager/cookie-manager-page.c:126 @@ -2307,8 +2310,12 @@ msgstr "フィルタ:" # tooltip #: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした cookie のみ表示します。" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " +"cookie のみ表示します。" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2319,11 +2326,11 @@ msgstr "Cookie マネージャ(_C)" msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" -#: ../extensions/dnsprefetch.c:143 +#: ../extensions/dnsprefetch.c:194 msgid "DNS prefetching" msgstr "DNS プリフェッチ" -#: ../extensions/dnsprefetch.c:144 +#: ../extensions/dnsprefetch.c:195 msgid "Prefetch IP addresses of hovered links" msgstr "マウスポインタを置いたリンクの IP アドレスを先読みします" @@ -2342,19 +2349,19 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "最終更新: %s" -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "フィード" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "新しいフィードの追加" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "フィードの削除" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "フィード(_F)" @@ -2412,35 +2419,39 @@ msgstr "フィードパネル" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/formhistory.c:276 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "フォーム値の追加に失敗しました: %s\n" + +#: ../extensions/formhistory.c:502 msgid "Stores history of entered form data" msgstr "入力されたフォームデータの履歴を記憶します" -#: ../extensions/formhistory.c:280 +#: ../extensions/formhistory.c:506 #, c-format msgid "Not available: %s" msgstr "利用できません: %s" -#: ../extensions/formhistory.c:281 +#: ../extensions/formhistory.c:507 msgid "Resource files not installed" msgstr "リソースファイルがインストールされていません" -#: ../extensions/formhistory.c:286 +#: ../extensions/formhistory.c:513 msgid "Form history filler" msgstr "入力フォーム履歴フィルタ" -#: ../extensions/mouse-gestures/main.c:246 +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" msgstr "マウスジェスチャ" # description -#: ../extensions/mouse-gestures/main.c:247 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" @@ -2448,20 +2459,24 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "タブとは別に 1 つ以上のページをパネルに表示します" + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "キーボードショートカットのカスタマイズ" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "ショートカットのカスタマイズ(_O)..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "ショートカット" # description -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "キーボードショートカットの表示および編集を行います" @@ -2480,29 +2495,40 @@ msgstr "ステータスバー機能" # description #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "ウェブページへの機能のオン/オフを簡単に切り換えます" +msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます" -#: ../extensions/tab-panel.c:562 -#: ../extensions/tab-panel.c:619 +#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 msgid "Tab Panel" msgstr "タブパネル" -#: ../extensions/tab-panel.c:603 +#: ../extensions/tab-panel.c:606 msgid "T_ab Panel" msgstr "タブパネル(_A)" # description -#: ../extensions/tab-panel.c:620 +#: ../extensions/tab-panel.c:623 msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "タブ履歴リスト" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "最後に使用された順の履歴から選択したタブに切り替えます" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "ツールバーのカスタマイズ" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロップで変更できます。" +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロッ" +"プで変更できます。" #: ../extensions/toolbar-editor.c:423 msgid "Available Items" @@ -2529,8 +2555,13 @@ msgstr "ツールバーのレイアウトを簡単に編集できます" msgid "Not available on this platform" msgstr "このプラットフォームでは利用できません" -#~ msgid "User_styles" -#~ msgstr "ユーザスタイル(_S)" -#~ msgid "Resizable text areas" -#~ msgstr "可変サイズのテキストエリアにする" +#: ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "ウェブキャッシュ" + +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "HTTP 通信をディスクにキャッシュします" +#~ msgid "Shrink images automatically" +#~ msgstr "画像を自動的に縮小する" diff --git a/po/ko.po b/po/ko.po index 2a079dbe..7405bea6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,1806 +2,1953 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Seo Sanghyeon 2009 +# Kim Boram 2009 # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: midori 0.1.10\n" +"Project-Id-Version: midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 00:44+0200\n" -"PO-Revision-Date: 2009-24-09 09:10+0200\n" -"Last-Translator: Seo Sanghyeon \n" -"Language-Team: Korean \n" +"POT-Creation-Date: 2009-12-13 01:44+0900\n" +"PO-Revision-Date: 2009-12-09 19:55+0900\n" +"Last-Translator: Kim Boram \n" +"Language-Team: Kim Boram \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "" +msgstr "가벼운 웹 브라우저" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1435 ../midori/main.c:1609 -#: ../midori/main.c:1617 ../midori/main.c:1628 -#: ../midori/midori-websettings.c:287 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1514 ../midori/main.c:1712 +#: ../midori/main.c:1720 ../midori/main.c:1731 +#: ../midori/midori-websettings.c:292 msgid "Midori" -msgstr "" +msgstr "미도리" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "" +msgstr "웹 브라우저" -#: ../midori/main.c:102 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "" +msgstr "설정을 읽을 수 없습니다: %s\n" -#: ../midori/main.c:157 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "" +msgstr "값 '%s'은(는) %s에 대한 잘못된 값입니다" -#: ../midori/main.c:164 ../midori/main.c:245 +#: ../midori/main.c:169 ../midori/main.c:255 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/main.c:369 +#: ../midori/main.c:379 ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "데이터베이스에 접속할 수 없음: %s\n" -#: ../midori/main.c:401 +#: ../midori/main.c:411 ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "" +msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" -#: ../midori/main.c:455 +#: ../midori/main.c:465 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "기록 항목을 제거할 수 없습니다.: %s\n" -#: ../midori/main.c:479 +#: ../midori/main.c:489 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "기록을 지울 수 없습니다: %s\n" -#: ../midori/main.c:502 ../midori/main.c:536 ../midori/main.c:552 +#: ../midori/main.c:512 ../midori/main.c:546 ../midori/main.c:562 #, c-format msgid "Failed to add history item: %s\n" -msgstr "" +msgstr "기록 항목을 더할 수 없습니다.: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:731 +#: ../midori/main.c:741 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n" -#: ../midori/main.c:760 +#: ../midori/main.c:770 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "" +msgstr "설정을 저장할 수 없습니다. %s" -#: ../midori/main.c:798 +#: ../midori/main.c:808 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "" +msgstr "검색 엔진을 저장할 수 없습니다. %s" -#: ../midori/main.c:817 ../midori/main.c:845 ../midori/main.c:874 +#: ../midori/main.c:827 ../midori/main.c:877 ../midori/main.c:897 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "" +msgstr "책갈피를 저장할 수 없습니다.%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:897 ../midori/main.c:920 +#: ../midori/main.c:927 ../midori/main.c:950 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "" +msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/main.c:993 +#: ../midori/main.c:1019 ../midori/main.c:1191 #, c-format msgid "The session couldn't be saved. %s" -msgstr "" +msgstr "세션을 저장할 수 없습니다.%s" -#: ../midori/main.c:1190 +#: ../midori/main.c:1229 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" +"미도리가 마지막으로 실행되었을 때 비 정상적으로 종료된 것 같습니다. 이런 일" +"이 계속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." -#: ../midori/main.c:1205 +#: ../midori/main.c:1244 msgid "Modify _preferences" -msgstr "" +msgstr "기본 설정 수정(_P)" -#: ../midori/main.c:1209 +#: ../midori/main.c:1248 msgid "Reset the last _session" -msgstr "" +msgstr "마지막 세션 초기화(_S)" -#: ../midori/main.c:1214 +#: ../midori/main.c:1253 msgid "Disable all _extensions" -msgstr "" +msgstr "모든 확장 기능 비 활성화(_E)" -#: ../midori/main.c:1435 +#: ../midori/main.c:1418 ../midori/main.c:1945 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "세션을 열 수 없습니다: %s\n" + +#: ../midori/main.c:1514 msgid "No filename specified" -msgstr "" +msgstr "파일 이름이 지정되지 않았습니다." -#: ../midori/main.c:1458 +#: ../midori/main.c:1537 msgid "An unknown error occured." -msgstr "" +msgstr "알 수 없는 오류가 발생했습니다." -#: ../midori/main.c:1490 +#: ../midori/main.c:1569 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "" +msgstr "이미지가 다음으로 저장되었습니다: %s\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1628 msgid "Run ADDRESS as a web application" -msgstr "" +msgstr "주소를 웹 응용 프로그램으로 실행" -#: ../midori/main.c:1539 +#: ../midori/main.c:1628 msgid "ADDRESS" -msgstr "" +msgstr "주소" -#: ../midori/main.c:1541 +#: ../midori/main.c:1631 msgid "Use FOLDER as configuration folder" -msgstr "" +msgstr "폴더를 설정 폴더로 사용합니다." -#: ../midori/main.c:1541 +#: ../midori/main.c:1631 msgid "FOLDER" -msgstr "" +msgstr "폴더" -#: ../midori/main.c:1543 +#: ../midori/main.c:1634 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "특정한 파일 이름을 자바 스크립트로 실행합니다" -#: ../midori/main.c:1546 +#: ../midori/main.c:1637 msgid "Take a snapshot of the specified URI" -msgstr "" +msgstr "지정한 URI의 화면을 저장합니다." -#: ../midori/main.c:1549 +#: ../midori/main.c:1640 msgid "Execute the specified command" -msgstr "" +msgstr "실행할 특정 명령어" -#: ../midori/main.c:1551 +#: ../midori/main.c:1642 msgid "Display program version" -msgstr "" +msgstr "프로그램의 버전을 표시합니다." -#: ../midori/main.c:1553 +#: ../midori/main.c:1644 msgid "Addresses" -msgstr "" +msgstr "주소" -#: ../midori/main.c:1606 +#: ../midori/main.c:1709 msgid "[Addresses]" -msgstr "" +msgstr "[주소]" -#: ../midori/main.c:1629 +#: ../midori/main.c:1732 msgid "Please report comments, suggestions and bugs to:" -msgstr "" +msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:" -#: ../midori/main.c:1631 +#: ../midori/main.c:1734 msgid "Check for new versions at:" -msgstr "" +msgstr "다음에서 새 버전 검색:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1816 msgid "The specified configuration folder is invalid." -msgstr "" +msgstr "지정된 설정 폴더가 잘못되었습니다." -#: ../midori/main.c:1751 +#: ../midori/main.c:1864 msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "미도리가 이미 실행되어 있지만 응답을 하지 않고 있습니다.\n" -#: ../midori/main.c:1795 +#: ../midori/main.c:1912 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "" +msgstr "검색 엔진을 불러올 수 없습니다. %s\n" -#: ../midori/main.c:1813 +#: ../midori/main.c:1930 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" +msgstr "책갈피를 읽을 수 없습니다: %s\n" -#: ../midori/main.c:1828 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1841 +#: ../midori/main.c:1958 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "" +msgstr "휴지통을 열 수 없습니다: %s\n" -#: ../midori/main.c:1854 +#: ../midori/main.c:1971 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "" +msgstr "기록을 열 수 없습니다: %s\n" -#: ../midori/main.c:1866 +#: ../midori/main.c:1983 msgid "The following errors occured:" -msgstr "" +msgstr "다음의 오류가 발생했습니다:" -#: ../midori/main.c:1882 +#: ../midori/main.c:1999 msgid "_Ignore" -msgstr "" +msgstr "무시(_I)" -#: ../midori/midori-array.c:251 +#: ../midori/midori-array.c:424 msgid "File not found." -msgstr "" +msgstr "파일이 없습니다." -#: ../midori/midori-array.c:260 ../midori/midori-array.c:270 +#: ../midori/midori-array.c:458 ../midori/midori-array.c:481 +#: ../midori/midori-array.c:491 msgid "Malformed document." -msgstr "" +msgstr "잘못된 문서." -#: ../midori/midori-array.c:432 ../midori/sokoke.c:699 +#: ../midori/midori-array.c:500 +msgid "Unrecognized bookmark format." +msgstr "책갈피 형식을 알 수 없습니다." + +#: ../midori/midori-array.c:714 ../midori/sokoke.c:965 #, c-format msgid "Writing failed." -msgstr "" +msgstr "쓸 수 없습니다." -#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4327 -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4973 msgid "Reload the current page" -msgstr "" +msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4970 msgid "Stop loading the current page" -msgstr "" +msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:417 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" -msgstr "" +msgstr "%d%% 불러옴" -#: ../midori/midori-browser.c:442 +#: ../midori/midori-browser.c:474 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "'%s'은(는) 기대하지 않은 동작입니다." -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:675 msgid "New folder" -msgstr "" +msgstr "새 폴더" -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:675 msgid "Edit folder" -msgstr "" +msgstr "폴더 편집" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:677 msgid "New bookmark" -msgstr "" +msgstr "새 책갈피" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:677 msgid "Edit bookmark" -msgstr "" +msgstr "책갈피 편집" -#: ../midori/midori-browser.c:659 +#: ../midori/midori-browser.c:707 msgid "_Title:" -msgstr "" +msgstr "제목(_T):" -#: ../midori/midori-browser.c:672 ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:720 ../midori/midori-searchaction.c:967 msgid "_Description:" -msgstr "" +msgstr "설명(_D):" -#: ../midori/midori-browser.c:691 ../midori/midori-searchaction.c:966 +#: ../midori/midori-browser.c:739 ../midori/midori-searchaction.c:981 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" -msgstr "" +msgstr "주소(_A):" -#: ../midori/midori-browser.c:710 +#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:4218 msgid "_Folder:" -msgstr "" +msgstr "폴더(_F):" -#: ../midori/midori-browser.c:715 ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:779 ../midori/midori-browser.c:855 +#: ../midori/midori-browser.c:4223 ../midori/midori-browser.c:4255 msgid "Toplevel folder" -msgstr "" +msgstr "최 상위 폴더" -#: ../midori/midori-browser.c:834 +#: ../midori/midori-browser.c:808 +msgid "Show in the tool_bar" +msgstr "도구 모음에 보이기(_B)" + +#: ../midori/midori-browser.c:823 +msgid "Run as _web application" +msgstr "웹 응용 프로그램으로 실행(_W)" + +#: ../midori/midori-browser.c:935 ../midori/midori-browser.c:4273 msgid "Save file as" -msgstr "" +msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1211 ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:1302 ../panels/midori-transfers.c:272 #, c-format msgid "%s of %s" -msgstr "" +msgstr "%s의 %s" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1338 #, c-format msgid "The file '%s' has been downloaded." -msgstr "" +msgstr " '%s' 파일을 다운로드 했습니다." -#: ../midori/midori-browser.c:1252 +#: ../midori/midori-browser.c:1342 msgid "Transfer completed" -msgstr "" +msgstr "전송이 끝났습니다" -#: ../midori/midori-browser.c:1393 +#: ../midori/midori-browser.c:1482 msgid "Save file" -msgstr "" +msgstr "파일 저장" -#: ../midori/midori-browser.c:2060 +#: ../midori/midori-browser.c:2181 msgid "Open file" -msgstr "" +msgstr "파일 열기" -#: ../midori/midori-browser.c:3268 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2257 ../extensions/feed-panel/main.c:356 msgid "New feed" -msgstr "" +msgstr "새 피드" + +#: ../midori/midori-browser.c:2290 ../midori/midori-browser.c:5014 +#: ../panels/midori-bookmarks.c:243 +msgid "Add a new bookmark" +msgstr "새 책갈피 더하기" + +#: ../midori/midori-browser.c:2851 ../midori/midori-searchaction.c:491 +msgid "Empty" +msgstr "비어있음" -#: ../midori/midori-browser.c:3523 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:3445 ../midori/sokoke.c:275 +#: ../midori/sokoke.c:285 ../midori/sokoke.c:313 ../midori/sokoke.c:335 +#: ../midori/sokoke.c:349 +msgid "Could not run external program." +msgstr "외부 프로그램을 실행할 수 없습니다." + +#: ../midori/midori-browser.c:3958 ../panels/midori-bookmarks.c:796 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" -msgstr "" +msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:3530 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3965 ../panels/midori-bookmarks.c:802 +#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" -msgstr "" +msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:3533 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3968 ../panels/midori-bookmarks.c:804 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" -msgstr "" +msgstr "새 창에서 열기(_W)" + +#: ../midori/midori-browser.c:4147 +msgid "Arora" +msgstr "아로라" -#: ../midori/midori-browser.c:3843 +#: ../midori/midori-browser.c:4148 +msgid "Kazehakase" +msgstr "카제하카세" + +#: ../midori/midori-browser.c:4149 +msgid "Opera" +msgstr "오페라" + +#: ../midori/midori-browser.c:4150 +msgid "Konqueror" +msgstr "컨쿼러" + +#: ../midori/midori-browser.c:4151 +msgid "Epiphany" +msgstr "에피파니" + +#: ../midori/midori-browser.c:4171 ../panels/midori-bookmarks.c:272 +msgid "Import bookmarks..." +msgstr "책갈피 가져오기..." + +#: ../midori/midori-browser.c:4174 ../midori/midori-browser.c:5019 +msgid "_Import bookmarks" +msgstr "책갈피 가져오기(_I)" + +#: ../midori/midori-browser.c:4184 +msgid "_Application:" +msgstr "응용 프로그램(_A):" + +#: ../midori/midori-browser.c:4210 ../midori/midori-browser.c:5118 +#: ../midori/midori-websettings.c:223 ../midori/midori-websettings.c:297 +#: ../katze/katze-utils.c:672 +msgid "Custom..." +msgstr "사용자 지정..." + +#: ../midori/midori-browser.c:4284 +msgid "Failed to import bookmarks" +msgstr "책갈피 가져오기 실패" + +#: ../midori/midori-browser.c:4430 msgid "Clear Private Data" -msgstr "" +msgstr "개인 데이터 모두 지우기" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:4434 msgid "_Clear private data" -msgstr "" +msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:3860 +#: ../midori/midori-browser.c:4447 msgid "Clear the following data:" -msgstr "" +msgstr "다음의 데이터 지우기:" -#: ../midori/midori-browser.c:3870 ../midori/midori-preferences.c:665 +#: ../midori/midori-browser.c:4457 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:108 msgid "History" -msgstr "방문 기록" +msgstr "기록" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:4462 msgid "Cookies" -msgstr "" +msgstr "쿠키" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4467 msgid "'Flash' Cookies" -msgstr "" +msgstr "'플래시' 쿠키" -#: ../midori/midori-browser.c:3885 +#: ../midori/midori-browser.c:4472 msgid "Website icons" -msgstr "" +msgstr "웹 사이트 아이콘" -#: ../midori/midori-browser.c:3890 ../midori/sokoke.c:873 +#: ../midori/midori-browser.c:4477 ../midori/sokoke.c:1124 msgid "_Closed Tabs" -msgstr "최근에 닫은 탭(_C)" +msgstr "닫힌 탭 (_C)" + +#: ../midori/midori-browser.c:4482 ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "웹 캐시" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4490 msgid "Clear private data when _quitting Midori" -msgstr "" +msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4586 msgid "A lightweight web browser." -msgstr "" +msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:3995 +#: ../midori/midori-browser.c:4602 msgid "translator-credits" -msgstr "Seo Sanghyeon " +msgstr "" +"Seo Sanghyeon \n" +"김보람 " -#: ../midori/midori-browser.c:4261 +#: ../midori/midori-browser.c:4884 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:4263 ../midori/sokoke.c:874 +#: ../midori/midori-browser.c:4886 ../midori/sokoke.c:1125 msgid "New _Window" msgstr "새 창(_W)" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4887 msgid "Open a new window" -msgstr "" +msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:4267 +#: ../midori/midori-browser.c:4890 msgid "Open a new tab" -msgstr "" +msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4893 msgid "Open a file" -msgstr "" +msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:4273 +#: ../midori/midori-browser.c:4896 msgid "Save to a file" -msgstr "" +msgstr "파일로 저장" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4898 msgid "Add to Speed _dial" -msgstr "" +msgstr "단축 번호 더하기(_D)" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4899 msgid "Add shortcut to speed dial" -msgstr "" +msgstr "단축 번호에 바로 가기를 더합니다" + +#: ../midori/midori-browser.c:4901 +msgid "Add Shortcut to the _desktop" +msgstr "바로 가기를 바탕 화면에 추가(_D)" + +#: ../midori/midori-browser.c:4902 +msgid "Add shortcut to the desktop" +msgstr "바로 가기를 바탕 화면에 추가" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4904 +msgid "Subscribe to News _feed" +msgstr "뉴스 피드 구독(_F)" + +#: ../midori/midori-browser.c:4905 +msgid "Subscribe to this news feed" +msgstr "뉴스 피드 구독" + +#: ../midori/midori-browser.c:4910 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4911 msgid "Close the current tab" -msgstr "" +msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4913 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4914 msgid "Close this window" -msgstr "" +msgstr "이 창을 닫습니다" -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4917 msgid "Print the current page" -msgstr "" +msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4920 msgid "Quit the application" -msgstr "" +msgstr "프로그램 끝내기" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4922 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4926 +msgid "Undo the last modification" +msgstr "마지막 수정 되돌리기" + +#: ../midori/midori-browser.c:4929 +msgid "Redo the last modification" +msgstr "마지막 수정 다시 실행" + +#: ../midori/midori-browser.c:4933 msgid "Cut the selected text" -msgstr "" +msgstr "선택한 텍스트를 클립보드로 잘라냅니다" -#: ../midori/midori-browser.c:4296 ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4936 ../midori/midori-browser.c:4939 msgid "Copy the selected text" -msgstr "" +msgstr "선택한 메시지를 클립보드로 복사합니다" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4942 msgid "Paste text from the clipboard" -msgstr "" +msgstr "클립보드에서 텍스트를 붙여 넣습니다" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4945 msgid "Delete the selected text" -msgstr "" +msgstr "선택한 텍스트를 지웁니다" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4948 msgid "Select all text" -msgstr "" +msgstr "모든 텍스트 선택" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4951 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4953 msgid "Find _Next" -msgstr "다시 찾기(_N)" +msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4954 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "다음에 나타나는 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4956 msgid "Find _Previous" -msgstr "" +msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4957 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "이전에 나타난 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4961 msgid "Configure the application preferences" -msgstr "" +msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4963 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4964 msgid "_Toolbars" -msgstr "" +msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4976 msgid "Increase the zoom level" -msgstr "" +msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:4979 msgid "Decrease the zoom level" -msgstr "" +msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4982 msgid "Reset the zoom level" -msgstr "" +msgstr "확대/축소 단계 초기화" -#: ../midori/midori-browser.c:4343 +#: ../midori/midori-browser.c:4983 msgid "_Encoding" -msgstr "문자 인코딩(_E)" +msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:4345 +#: ../midori/midori-browser.c:4985 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4986 msgid "View the source code of the page" -msgstr "" +msgstr "페이지의 소스 코드를 보여줍니다" -#: ../midori/midori-browser.c:4348 +#: ../midori/midori-browser.c:4988 msgid "View Selection Source" -msgstr "" +msgstr "선택 소스 보기" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:4989 msgid "View the source code of the selection" -msgstr "" +msgstr "선택한 소스 코드를 보여줍니다" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4993 msgid "Toggle fullscreen view" -msgstr "" +msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4995 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:4358 +#: ../midori/midori-browser.c:4998 msgid "Go back to the previous page" -msgstr "" +msgstr "전에 들렀던 페이지로 갑니다" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:5001 msgid "Go forward to the next page" -msgstr "" +msgstr "다음 들렀던 페이지로 갑니다" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:5004 msgid "Go to your homepage" -msgstr "" +msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:5006 msgid "Empty Trash" -msgstr "" +msgstr "휴지통 지우기" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:5007 msgid "Delete the contents of the trash" -msgstr "" +msgstr "휴지통에 있는 모든 항목을 지웁니다" -#: ../midori/midori-browser.c:4369 +#: ../midori/midori-browser.c:5009 msgid "Undo _Close Tab" -msgstr "" +msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:5010 msgid "Open the last closed tab" -msgstr "" +msgstr "마지막에 닫은 탭을 엽니다." -#: ../midori/midori-browser.c:4374 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "" - -#: ../midori/midori-browser.c:4376 +#: ../midori/midori-browser.c:5016 msgid "Add a new _folder" -msgstr "" +msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:4377 +#: ../midori/midori-browser.c:5017 msgid "Add a new bookmark folder" -msgstr "" +msgstr "새 책갈피 폴더를 더합니다" -#: ../midori/midori-browser.c:4379 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5022 ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" -msgstr "" +msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:5023 msgid "Add, edit and remove search engines..." -msgstr "" +msgstr "검색 엔진을 더하고 편집, 제거합니다..." -#: ../midori/midori-browser.c:4383 +#: ../midori/midori-browser.c:5026 msgid "_Clear Private Data" -msgstr "" +msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:5027 msgid "Clear private data..." -msgstr "" +msgstr "개인 데이터 지우기..." -#: ../midori/midori-browser.c:4388 +#: ../midori/midori-browser.c:5031 msgid "_Previous Tab" -msgstr "" +msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:5032 msgid "Switch to the previous tab" -msgstr "" +msgstr "이전 탭으로 가기" -#: ../midori/midori-browser.c:4391 +#: ../midori/midori-browser.c:5034 msgid "_Next Tab" -msgstr "" +msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:4392 +#: ../midori/midori-browser.c:5035 msgid "Switch to the next tab" -msgstr "" +msgstr "다음 탭으로 가기" + +#: ../midori/midori-browser.c:5037 +msgid "Focus _Current Tab" +msgstr "현재 탭에 포커스 맞추기(_C)" + +#: ../midori/midori-browser.c:5038 +msgid "Focus the current tab" +msgstr "현재 탭에 포커스 맞추기" + +#: ../midori/midori-browser.c:5040 +msgid "Open last _session" +msgstr "마지막 세션 열기(_S)" + +#: ../midori/midori-browser.c:5041 +msgid "Open the tabs saved in the last session" +msgstr "마지막 세션에서 저장된 탭 열기" -#: ../midori/midori-browser.c:4394 +#: ../midori/midori-browser.c:5043 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:5045 msgid "_Contents" -msgstr "도움말 목차(_C)" +msgstr "차례(_C)" -#: ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:5046 msgid "Show the documentation" -msgstr "" +msgstr "문서 보기" -#: ../midori/midori-browser.c:4399 +#: ../midori/midori-browser.c:5048 msgid "_Frequent Questions" -msgstr "" +msgstr "일반적인 질문들(_F)" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:5049 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "자주 하는 질문의 답변 보기" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:5051 msgid "_Report a Bug" -msgstr "" +msgstr "버그 보고(_R)" -#: ../midori/midori-browser.c:4403 +#: ../midori/midori-browser.c:5052 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "미도리의 버그 트래커를 엽니다" -#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:5055 msgid "Show information about the program" -msgstr "" +msgstr "프로그램 정보를 보여줍니다" -#: ../midori/midori-browser.c:4413 +#: ../midori/midori-browser.c:5062 msgid "P_rivate Browsing" -msgstr "" +msgstr "개인 정보 보호 모드(&R)" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:5063 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "브라우저 사용 중 어떤 개인 데이터도 저장하지 않습니다" -#: ../midori/midori-browser.c:4419 +#: ../midori/midori-browser.c:5068 msgid "_Menubar" -msgstr "" +msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:5069 msgid "Show menubar" -msgstr "" +msgstr "메뉴 모음 보기" -#: ../midori/midori-browser.c:4423 +#: ../midori/midori-browser.c:5072 msgid "_Navigationbar" -msgstr "" +msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:4424 +#: ../midori/midori-browser.c:5073 msgid "Show navigationbar" -msgstr "" +msgstr "내비게이션 줄 보기" -#: ../midori/midori-browser.c:4427 +#: ../midori/midori-browser.c:5076 msgid "Side_panel" -msgstr "" +msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:4428 +#: ../midori/midori-browser.c:5077 msgid "Show sidepanel" -msgstr "" +msgstr "가장자리 패널 보기" -#: ../midori/midori-browser.c:4431 +#: ../midori/midori-browser.c:5080 msgid "_Bookmarkbar" -msgstr "" +msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:4432 +#: ../midori/midori-browser.c:5081 msgid "Show bookmarkbar" -msgstr "" +msgstr "책갈피 모음 보기" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:5084 msgid "_Transferbar" -msgstr "" +msgstr "전송 줄(_T)" -#: ../midori/midori-browser.c:4436 +#: ../midori/midori-browser.c:5085 msgid "Show transferbar" -msgstr "" +msgstr "전송 줄 보기" -#: ../midori/midori-browser.c:4439 +#: ../midori/midori-browser.c:5088 msgid "_Statusbar" -msgstr "" +msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:5089 msgid "Show statusbar" -msgstr "" +msgstr "상태 표시줄을 봅니다" -#: ../midori/midori-browser.c:4447 +#: ../midori/midori-browser.c:5096 msgid "_Automatic" -msgstr "자동 선택(_A)" +msgstr "자동(_A)" -#: ../midori/midori-browser.c:4450 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:5099 ../midori/midori-websettings.c:217 msgid "Chinese (BIG5)" -msgstr "" +msgstr "중국어 번체 (Big5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4454 +#: ../midori/midori-browser.c:5103 msgid "Japanese (SHIFT__JIS)" -msgstr "" +msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-browser.c:4457 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5106 ../midori/midori-websettings.c:219 +msgid "Korean (EUC-KR)" +msgstr "한국어 (EUC-KR)" + +#: ../midori/midori-browser.c:5109 ../midori/midori-websettings.c:220 msgid "Russian (KOI8-R)" -msgstr "" +msgstr "키릴어 (KOI8-R)" -#: ../midori/midori-browser.c:4460 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5112 ../midori/midori-websettings.c:221 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "유니코드 (UTF-8)" -#: ../midori/midori-browser.c:4463 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5115 ../midori/midori-websettings.c:222 msgid "Western (ISO-8859-1)" -msgstr "" +msgstr "서양어 (ISO-8859-1)" -#: ../midori/midori-browser.c:4466 ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 -msgid "Custom..." -msgstr "" - -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5667 msgid "_Separator" -msgstr "" +msgstr "구분선(_S)" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5674 msgid "_Location..." -msgstr "" +msgstr "위치(_L)..." -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:5676 msgid "Open a particular location" -msgstr "" +msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5700 msgid "_Web Search..." -msgstr "" +msgstr "웹 검색(_W)..." -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5702 msgid "Run a web search" -msgstr "" +msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5723 msgid "Reopen a previously closed tab or window" -msgstr "" +msgstr "이전에 닫힌 탭 혹은 창을 다시 엽니다" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5738 msgid "_Recently visited pages" -msgstr "" +msgstr "최근 방문한 페이지(_R)" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5740 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "이전에 방문한 페이지를 다시 엽니다" -#: ../midori/midori-browser.c:4995 ../midori/sokoke.c:862 +#: ../midori/midori-browser.c:5755 ../midori/sokoke.c:1114 msgid "_Bookmarks" -msgstr "북마크(_B)" +msgstr "책갈피(_B)" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5757 msgid "Show the saved bookmarks" -msgstr "" +msgstr "저장된 책갈피 보기" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5772 msgid "_Tools" msgstr "도구(_T)" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5785 msgid "_Window" msgstr "창(_W)" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5787 msgid "Show a list of all open tabs" -msgstr "" +msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5801 msgid "_Menu" -msgstr "" +msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5803 msgid "Menu" -msgstr "" +msgstr "메뉴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:6008 msgid "_Inline Find:" -msgstr "" +msgstr "바로 찾기(_I):" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:6039 msgid "Previous" -msgstr "" +msgstr "이전" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:6044 msgid "Next" -msgstr "" +msgstr "다음" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:6049 msgid "Match Case" -msgstr "" +msgstr "대소문자 일치" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:6058 msgid "Highlight Matches" -msgstr "" +msgstr "일치하는 단어 강조 표시" -#: ../midori/midori-browser.c:5281 +#: ../midori/midori-browser.c:6070 msgid "Close Findbar" -msgstr "" +msgstr "찾기 줄 닫기" -#: ../midori/midori-browser.c:5316 ../panels/midori-transfers.c:143 +#: ../midori/midori-browser.c:6116 ../panels/midori-transfers.c:143 msgid "Clear All" -msgstr "" +msgstr "모두 지우기" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:6474 #, c-format msgid "Unexpected setting '%s'" -msgstr "" +msgstr "기대하지 않은 설정 '%s'" -#: ../midori/midori-locationaction.c:941 +#: ../midori/midori-locationaction.c:974 #, c-format msgid "Search with %s" -msgstr "" +msgstr "%s(으)로 검색" -#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 msgid "Detach chosen panel from the window" -msgstr "" +msgstr "선택한 패널 창에서 분리" -#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 +#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 msgid "Align sidepanel to the right" -msgstr "" +msgstr "창을 오른쪽으로 이동" -#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 msgid "Close panel" -msgstr "" +msgstr "패널 닫기" -#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the left" -msgstr "" +msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:722 msgid "Show panel _titles" -msgstr "" +msgstr "패널 제목 표시(_T)" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:729 msgid "Show operating _controls" -msgstr "" +msgstr "컨트롤 보기/감추기(_C)" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:834 msgid "Options" -msgstr "" +msgstr "옵션" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" -msgstr "" +msgstr "빈 페이지 보기" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" -msgstr "" +msgstr "홈 페이지 보기" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" -msgstr "" +msgstr "마지막에 연 탭 보기" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:218 msgid "Japanese (SHIFT_JIS)" -msgstr "" +msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "New tab" -msgstr "" +msgstr "새 탭" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "New window" -msgstr "" +msgstr "새 창" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Current tab" -msgstr "" +msgstr "현재 탭" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Default" -msgstr "" +msgstr "기본 값" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "Icons" -msgstr "" +msgstr "아이콘" + +#: ../midori/midori-websettings.c:257 +msgid "Small icons" +msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:258 msgid "Text" -msgstr "" +msgstr "텍스트" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:259 msgid "Icons and text" -msgstr "" +msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:260 msgid "Text beside icons" -msgstr "" +msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:275 msgid "All cookies" -msgstr "" +msgstr "모든 쿠키" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:276 msgid "Session cookies" -msgstr "" +msgstr "세션 쿠키" -#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:277 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:648 msgid "None" -msgstr "" +msgstr "없음" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "Safari" -msgstr "" +msgstr "사파리" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:294 +msgid "iPhone" +msgstr "아이폰" + +#: ../midori/midori-websettings.c:295 msgid "Firefox" -msgstr "" +msgstr "파이어폭스" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:296 msgid "Internet Explorer" -msgstr "" +msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:349 msgid "Remember last window size" -msgstr "" +msgstr "마지막에 연 창 크기 기억" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:350 msgid "Whether to save the last window size" -msgstr "" +msgstr "마지막에 연 창의 크기를 저장할지 결정합니다" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:358 msgid "Last window width" -msgstr "" +msgstr "마지막에 연 창 너비" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:359 msgid "The last saved window width" -msgstr "" +msgstr "저장된 마지막에 연 창의 너비" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:367 msgid "Last window height" -msgstr "" +msgstr "마지막에 연 창 높이" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:368 msgid "The last saved window height" -msgstr "" +msgstr "저장된 마지막에 연 창의 높이" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:393 msgid "Last panel position" -msgstr "" +msgstr "마지막에 연 패널 위치" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:394 msgid "The last saved panel position" -msgstr "" +msgstr "저장된 마지막에 연 패널의 위치" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:403 msgid "Last panel page" -msgstr "" +msgstr "마지막 패널 페이지" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:404 msgid "The last saved panel page" -msgstr "" +msgstr "저장된 마지막에 연 패널 페이지" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:412 msgid "Last Web search" -msgstr "" +msgstr "마지막 웹 검색" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:413 msgid "The last saved Web search" -msgstr "" +msgstr "저장된 마지막에 한 검색" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:422 msgid "Show Menubar" -msgstr "" +msgstr "메뉴 모음 보기" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the menubar" -msgstr "" +msgstr "메뉴 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:431 msgid "Show Navigationbar" -msgstr "" +msgstr "내비게이션 바 보기" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "내비게이션 바를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:440 msgid "Show Bookmarkbar" -msgstr "" +msgstr "책갈피 모음 보기" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "책갈피 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:449 msgid "Show Panel" -msgstr "" +msgstr "패널 표시" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the panel" -msgstr "" +msgstr "패널을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:465 msgid "Show Transferbar" -msgstr "" +msgstr "전송 줄 보기" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the transferbar" -msgstr "" +msgstr "전송 줄을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:474 msgid "Show Statusbar" -msgstr "" +msgstr "상태 표시줄을 보입니다" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the statusbar" -msgstr "" +msgstr "상태를 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:484 msgid "Toolbar Style:" -msgstr "" +msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:485 msgid "The style of the toolbar" -msgstr "" +msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:501 msgid "Show progress in location entry" -msgstr "" +msgstr "위치 항목에 진행 상태 표시" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:502 msgid "Whether to show loading progress in the location entry" -msgstr "" +msgstr "불러오기 진행 상태를 위치 입력 줄에 표시할지 선택합니다" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:517 msgid "Search engines in location completion" -msgstr "" +msgstr "위치를 완성하는데 검색 엔진 사용" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:518 msgid "Whether to show search engines in the location completion" -msgstr "" +msgstr "위치 입력을 완성하는데 검색 엔진을 사용할지 선택합니다." -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:526 msgid "Toolbar Items" -msgstr "" +msgstr "도구 모음 항목" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:527 msgid "The items to show on the toolbar" -msgstr "" +msgstr "도구 모음에 보일 항목" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:535 msgid "Compact Sidepanel" -msgstr "" +msgstr "간략한 사이드 패널(_C)" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:536 msgid "Whether to make the sidepanel compact" -msgstr "" +msgstr "사이드 패널을 간단하게 표시할지 결정합니다" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:551 msgid "Show operating controls of the panel" -msgstr "" +msgstr "기능 조정 콘드롤 패널에 보기" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:552 msgid "Whether to show the operating controls of the panel" -msgstr "" +msgstr "기능 조절 콘트롤을 패널에 보일지 결정합니다" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:567 msgid "Align sidepanel on the right" -msgstr "" +msgstr "사이드 표시 줄을 오른쪽에" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:568 msgid "Whether to align the sidepanel on the right" -msgstr "" +msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다.." + +#: ../midori/midori-websettings.c:583 +msgid "Open panels in separate windows" +msgstr "패널 분리된 창에 열기" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:584 +msgid "Whether to always open panels in separate windows" +msgstr "패널을 항상 분리된 창에 보일지 선택합니다." + +#: ../midori/midori-websettings.c:593 msgid "When Midori starts:" -msgstr "" +msgstr "미도리 시작 시:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:594 msgid "What to do when Midori starts" -msgstr "" +msgstr "미도리 시작 시 어떤 것을 할지 결정합니다" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:603 msgid "Homepage:" -msgstr "" +msgstr "홈페이지:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:604 msgid "The homepage" -msgstr "" +msgstr "홈페이지" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:619 msgid "Show crash dialog" -msgstr "" +msgstr "충돌 대화 상자 보기" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:620 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:636 msgid "Show speed dial in new tabs" -msgstr "" +msgstr "단축 번호를 새 탭에 보기" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:637 msgid "Show speed dial in newly opened tabs" -msgstr "" +msgstr "단축 번호를 새로 열린 탭에 표시합니다." -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:645 msgid "Save downloaded files to:" -msgstr "" +msgstr "다운로드한 파일을 저장할 경로:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:646 msgid "The folder downloaded files are saved to" -msgstr "" +msgstr "다운로드한 파일이 저장되는 폴더" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:667 msgid "Ask for the destination folder" -msgstr "" +msgstr "저장 할 폴더 물어보기" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:668 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" +msgstr "파일을 다운로드한 때 저장할 폴더를 물어볼지 선택합니다" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:687 msgid "Notify when a transfer has been completed" -msgstr "" +msgstr "전송이 완료되면 알려줍니다" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:688 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" +msgstr "전송이 끝나면 알림을 보여줄지 선택합니다" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:700 msgid "Download Manager" -msgstr "" +msgstr "다운로드 관리자" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:701 msgid "An external download manager" -msgstr "" +msgstr "외부 다운로드 관리자" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:709 msgid "Text Editor" -msgstr "" +msgstr "텍스트 편집기" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:710 msgid "An external text editor" -msgstr "" +msgstr "외부 텍스트 편집기" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:725 msgid "News Aggregator" -msgstr "" +msgstr "뉴스 수집기" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:726 msgid "An external news aggregator" -msgstr "" +msgstr "외부 뉴스 수집기" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:734 msgid "Location entry Search" -msgstr "" +msgstr "위치 항목에서 검색" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:735 msgid "The search to perform inside the location entry" -msgstr "" +msgstr "위치 항목 안에서 검색을 실행합니다" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:743 msgid "Preferred Encoding" -msgstr "" +msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:744 msgid "The preferred character encoding" -msgstr "" +msgstr "우선할 문자 인코딩" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:754 msgid "Always Show Tabbar" -msgstr "" +msgstr "탭 모음 항상 보기" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:755 msgid "Always show the tabbar" -msgstr "" +msgstr "탭 모음을 항상 보입니다." -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:763 msgid "Close Buttons on Tabs" -msgstr "" +msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:764 msgid "Whether tabs have close buttons" -msgstr "" +msgstr "탭에 닫기 단추 표시지 결정합니다." -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:772 msgid "Open new pages in:" -msgstr "" +msgstr "새 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:773 msgid "Where to open new pages" -msgstr "" +msgstr "새 페이지를 어디에서 열지 결정합니다" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:782 msgid "Open external pages in:" -msgstr "" +msgstr "외부 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:783 msgid "Where to open externally opened pages" -msgstr "" +msgstr "외부적으로 열린 페이지를 어디에 열지 결정합니다" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:792 msgid "Middle click opens Selection" -msgstr "" +msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:793 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:801 msgid "Open tabs in the background" -msgstr "" +msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:802 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:810 msgid "Open Tabs next to Current" -msgstr "" +msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:811 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:819 msgid "Open popups in tabs" -msgstr "" +msgstr "팝업 창을 탭에 열기" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:820 msgid "Whether to open popup windows in tabs" -msgstr "" +msgstr "팝업 창을 탭에 열지 결정합니다" + +#: ../midori/midori-websettings.c:830 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "자동으로 그림 읽기" + +#: ../midori/midori-websettings.c:831 +msgid "Load and display images automatically" +msgstr "그림을 자동으로 읽어 표시합니다." + +#: ../midori/midori-websettings.c:838 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "스크립트 활성화" + +#: ../midori/midori-websettings.c:839 +msgid "Enable embedded scripting languages" +msgstr "스크립트 언어를 활성화 합니다" + +#: ../midori/midori-websettings.c:846 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "넷스케이프 플러그인 활성화" + +#: ../midori/midori-websettings.c:847 +msgid "Enable embedded Netscape plugin objects" +msgstr "넷스케이프 플러그인 개체를 활성화 합니다" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:862 msgid "Zoom Text and Images" -msgstr "" +msgstr "문자와 그림 확대" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:863 msgid "Whether to zoom text and images" -msgstr "" +msgstr "문자와 그림을 확대할지 결정합니다" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:878 msgid "Find inline while typing" -msgstr "" +msgstr "주소 창에 입력할 때 바로 찾기" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:879 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "입력 중 자동으로 찾을지 결정합니다" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:894 +msgid "Kinetic scrolling" +msgstr "동역학 스크롤" + +#: ../midori/midori-websettings.c:895 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." + +#: ../midori/midori-websettings.c:903 msgid "Accept cookies" -msgstr "" +msgstr "쿠키 받아들임" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:904 msgid "What type of cookies to accept" -msgstr "" +msgstr "받아들일 쿠키의 종류를 결정합니다" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:913 msgid "Original cookies only" -msgstr "" +msgstr "원본 쿠키만" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:914 msgid "Accept cookies from the original website only" -msgstr "" +msgstr "원본 웹 사이트 쿠키만 받아들입니다" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:922 msgid "Maximum cookie age" -msgstr "" +msgstr "쿠키의 최대 기한" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:923 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "쿠키를 저장할 최대 일 수" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:940 msgid "Remember last visited pages" -msgstr "" +msgstr "마지막으로 방문한 페이지 기억" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:941 msgid "Whether the last visited pages are saved" -msgstr "" +msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:949 msgid "Maximum history age" -msgstr "" +msgstr "기록의 최대 기한" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:950 msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "" +msgstr "방문 기록을 저장할 최대 일 수" -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:958 msgid "Remember last downloaded files" -msgstr "" +msgstr "마지막에 다운로드한 파일 기억" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:959 msgid "Whether the last downloaded files are saved" -msgstr "" +msgstr "마지막으로 다운로드한 파일을 저장할지 결정합니다" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:969 msgid "Proxy Server" -msgstr "" +msgstr "프록시 서버" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:970 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "HTTP 연결에 사용되는 프록시 서버" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:985 msgid "Detect proxy server automatically" -msgstr "" +msgstr "프록시 서버 자동으로 검색" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:986 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" +msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" -msgstr "" +msgstr "식별 명" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" -msgstr "" +msgstr "웹 페이지에 보낼 유저 에이전트 식별 명을 지정합니다" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" -msgstr "" +msgstr "식별 문자열" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" -msgstr "" - -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "" +msgstr "응용 프로그램 식별 문자열" -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1035 msgid "Clear private data" -msgstr "" +msgstr "개인 데이터 지우기" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1036 msgid "The private data selected for deletion" -msgstr "" +msgstr "삭제를 위해 선택한 개인 데이터" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:782 ../midori/midori-view.c:3043 -#: ../midori/midori-view.c:3047 +#: ../midori/midori-view.c:915 ../midori/midori-view.c:3828 +#: ../midori/midori-view.c:3832 #, c-format msgid "Error - %s" -msgstr "" +msgstr "오류 - %s" -#: ../midori/midori-view.c:783 +#: ../midori/midori-view.c:916 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "" +msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#: ../midori/midori-view.c:788 +#: ../midori/midori-view.c:921 msgid "Try again" -msgstr "" +msgstr "다시 시도하십시오" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:821 +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "%s이(가) 발견되지 않았습니다" + +#: ../midori/midori-view.c:1168 ../midori/midori-view.c:1912 +#, c-format +msgid "Send a message to %s" +msgstr "%s에 메시지 보내기" -#: ../midori/midori-view.c:1218 +#: ../midori/midori-view.c:1739 ../midori/midori-view.c:1807 msgid "Open _Link" -msgstr "" +msgstr "링크 열기(_L)" -#: ../midori/midori-view.c:1220 +#: ../midori/midori-view.c:1742 ../midori/midori-view.c:1809 msgid "Open Link in New _Tab" -msgstr "" +msgstr "링크 새 탭에서 열기(_T)" + +#: ../midori/midori-view.c:1746 +msgid "Open Link in _Foreground Tab" +msgstr "링크 전경 탭에 열기(_F)" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1747 +msgid "Open Link in _Background Tab" +msgstr "링크 배경 탭에 열기(_B)" + +#: ../midori/midori-view.c:1750 ../midori/midori-view.c:1816 msgid "Open Link in New _Window" -msgstr "" +msgstr "링크 새 창에서 열기(_W)" -#: ../midori/midori-view.c:1243 -msgid "_Download Link destination" -msgstr "" +#: ../midori/midori-view.c:1753 +msgid "_Copy Link destination" +msgstr "링크 위치 복사(_C)" -#: ../midori/midori-view.c:1249 +#: ../midori/midori-view.c:1756 ../midori/midori-view.c:1828 msgid "_Save Link destination" -msgstr "" +msgstr "링크 다른 이름으로 저장(_S)" + +#: ../midori/midori-view.c:1757 ../midori/midori-view.c:1822 +msgid "_Download Link destination" +msgstr "링크 다운로드(_D)" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1761 ../midori/midori-view.c:1797 +#: ../midori/midori-view.c:1833 msgid "Download with Download _Manager" -msgstr "" +msgstr "다운로드 관리자로 다운로드(_M)" + +#: ../midori/midori-view.c:1773 +msgid "Open _Image in New Tab" +msgstr "그림 새 탭에서 열기(_I)" + +#: ../midori/midori-view.c:1776 +msgid "Open Image in New Wi_ndow" +msgstr "그림 새 창에서 열기(_N)" + +#: ../midori/midori-view.c:1779 +msgid "Copy Image _Address" +msgstr "그림 주소 복사(_A)" + +#: ../midori/midori-view.c:1782 +msgid "Save I_mage" +msgstr "그림 저장(_M)" -#: ../midori/midori-view.c:1287 +#: ../midori/midori-view.c:1783 +msgid "Download I_mage" +msgstr "그림 다운로드(_M)" + +#: ../midori/midori-view.c:1790 +msgid "Copy Video _Address" +msgstr "비디오 주소 복사(_A)" + +#: ../midori/midori-view.c:1793 +msgid "Save _Video" +msgstr "비디오 저장(_V)" + +#: ../midori/midori-view.c:1793 +msgid "Download _Video" +msgstr "비디오 다운로드(_V)" + +#: ../midori/midori-view.c:1853 msgid "Search _with" -msgstr "" +msgstr "다음으로 검색(_W)" -#: ../midori/midori-view.c:1319 +#: ../midori/midori-view.c:1888 ../midori/midori-view.c:1899 msgid "_Search the Web" -msgstr "" +msgstr "웹 검색(_S)" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1920 msgid "Open Address in New _Tab" -msgstr "" +msgstr "주소 새 탭에서 열기(_T)" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:2187 msgid "Open or download file" -msgstr "" +msgstr "파일을 열거나 다운로드 합니다" -#: ../midori/midori-view.c:1524 +#: ../midori/midori-view.c:2210 #, c-format msgid "File Type: '%s'" -msgstr "" +msgstr "파일 종류: '%s'" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:2213 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "파일 종류: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1531 +#: ../midori/midori-view.c:2217 #, c-format msgid "Open %s" -msgstr "" +msgstr "%s 열기" -#: ../midori/midori-view.c:1981 +#: ../midori/midori-view.c:2733 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "페이지 살피기 - %s" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2951 msgid "Speed dial" -msgstr "" +msgstr "단축 번호" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2952 msgid "Click to add a shortcut" -msgstr "" +msgstr "바로 가기를 더하려면 누르십시오" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2953 msgid "Enter shortcut address" -msgstr "" +msgstr "바로 가기 주소 입력" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2954 msgid "Enter shortcut title" -msgstr "" +msgstr "바로 가기 제목을 입력" -#: ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2955 msgid "Are you sure you want to delete this shortcut?" -msgstr "" +msgstr "이 바로 가기를 정말로 삭제하시겠습니까?" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2985 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "문서를 표시할 수 없습니다." -#: ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:3002 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "설치된 문서화 도구가 없습니다" -#: ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:3129 msgid "Blank page" -msgstr "" - -#: ../midori/midori-view.c:2581 ../midori/sokoke.c:870 -msgid "New _Tab" -msgstr "새 탭(_T)" +msgstr "빈 페이지" -#: ../midori/midori-view.c:2595 +#: ../midori/midori-view.c:3372 msgid "_Duplicate Tab" -msgstr "" +msgstr "탭 복제(_D)" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3377 msgid "_Restore Tab" -msgstr "" +msgstr "탭 되돌리기(_R)" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3377 msgid "_Minimize Tab" -msgstr "" +msgstr "탭 최소화(_M)" -#: ../midori/midori-view.c:3149 +#: ../midori/midori-view.c:3934 msgid "Print background images" -msgstr "" +msgstr "배경 그림 인쇄" -#: ../midori/midori-view.c:3150 +#: ../midori/midori-view.c:3935 msgid "Whether background images should be printed" -msgstr "" +msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-view.c:3194 ../midori/midori-preferences.c:484 +#: ../midori/midori-view.c:3979 ../midori/midori-preferences.c:398 msgid "Features" -msgstr "" - -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "" +msgstr "기능" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:318 msgid "General" -msgstr "" +msgstr "일반" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:319 msgid "Startup" -msgstr "" +msgstr "시작" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:334 ../midori/midori-preferences.c:341 msgid "Use current page as homepage" -msgstr "" +msgstr "현재 페이지를 홈 페이지로 사용" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:351 ../panels/midori-transfers.c:88 msgid "Transfers" -msgstr "다운로드" +msgstr "전송" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:366 msgid "Appearance" -msgstr "" +msgstr "모양새" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:367 msgid "Font settings" -msgstr "" +msgstr "글꼴 설정" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" -msgstr "" +msgstr "기본 글꼴 패밀리" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:372 msgid "The default font family used to display text" -msgstr "" +msgstr "문자를 표시할 기본 글꼴 패밀리" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" -msgstr "" +msgstr "문자를 표시할 기본 글꼴 크기" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:377 msgid "Fixed-width Font Family" -msgstr "" +msgstr "고정 폭 글꼴 패밀리" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:380 msgid "The font family used to display fixed-width text" -msgstr "" +msgstr "고정 폭 문자를 표시할 글꼴 패밀리" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:383 msgid "The font size used to display fixed-width text" -msgstr "" +msgstr "고정 폭 문자를 표시할 글꼴 크기" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:385 msgid "Minimum Font Size" -msgstr "" +msgstr "최소 글꼴 크기" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:388 msgid "The minimum font size used to display text" -msgstr "" - -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "" +msgstr "문자를 표시할 최소 글꼴 크기" #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:397 msgid "Behavior" -msgstr "" - -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:492 -msgid "Shrink images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:493 -msgid "Automatically shrink standalone images to fit" -msgstr "" - -#: ../midori/midori-preferences.c:499 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "" - -#: ../midori/midori-preferences.c:500 -msgid "Enable embedded scripting languages" -msgstr "" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "" +msgstr "행동" -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded Netscape plugin objects" -msgstr "" - -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" -msgstr "" +msgstr "96DPI 강제 지정" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" -msgstr "" +msgstr "해상도를 96DPI로 강제 지정합니다" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" -msgstr "" +msgstr "개발자 도구 활성화" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" -msgstr "" +msgstr "개발자를 위한 특별 확장 기능을 활성화 합니다" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" -msgstr "" +msgstr "맞춤법 검사" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" -msgstr "" +msgstr "맞춤법 검사 활성화" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" -msgstr "" +msgstr "입력 중 문법 검사를 활성화 합니다" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:441 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" -msgstr "" +msgstr "문법 검사를 할 언어는 쉼표로 구분합니다, 예: \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:449 msgid "Interface" -msgstr "" +msgstr "인터페이스" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" -msgstr "" +msgstr "내비게이션 줄" -#: ../midori/midori-preferences.c:544 +#: ../midori/midori-preferences.c:460 msgid "Browsing" -msgstr "" +msgstr "탐색 중" #. Page "Applications" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "프로그램" -#: ../midori/midori-preferences.c:569 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "외부 프로그램" #. Page "Network" -#: ../midori/midori-preferences.c:615 ../midori/midori-preferences.c:616 +#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500 msgid "Network" msgstr "네트워크" -#: ../midori/midori-preferences.c:643 -msgid "MB" -msgstr "" - #. Page "Privacy" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:519 msgid "Privacy" msgstr "개인 정보" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:520 msgid "Web Cookies" -msgstr "" +msgstr "웹 쿠키" -#: ../midori/midori-preferences.c:662 ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:531 ../midori/midori-preferences.c:538 msgid "days" msgstr "일" -#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 -msgid "Empty" -msgstr "" - -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Add search engine" -msgstr "" +msgstr "검색 엔진 더하기" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Edit search engine" -msgstr "" +msgstr "검색 엔진 편집" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:951 msgid "_Name:" -msgstr "" +msgstr "이름(_N):" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:995 msgid "_Icon:" -msgstr "" +msgstr "아이콘(_I):" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1009 msgid "_Token:" -msgstr "" +msgstr "토큰(_T):" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1232 msgid "Manage Search Engines" -msgstr "" +msgstr "검색 엔진 관리" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1333 msgid "Use as _default" -msgstr "" - -#: ../midori/sokoke.c:166 ../midori/sokoke.c:178 -msgid "Could not run external program." -msgstr "" +msgstr "기본으로 사용(_D)" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:1113 msgid "_Bookmark" -msgstr "" +msgstr "책갈피(_B)" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:1115 msgid "Add Boo_kmark" -msgstr "북마크에 추가(_K)" +msgstr "책갈피 더하기(_K)" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:1116 msgid "_Console" -msgstr "" +msgstr "콘솔(_C)" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:1117 msgid "_Extensions" msgstr "확장 기능(_E)" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:1118 msgid "_History" -msgstr "방문 기록(_H)" +msgstr "기록(_H)" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:1119 msgid "_Homepage" -msgstr "홈 페이지(_H)" +msgstr "홈페이지(_H)" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:1120 msgid "_Userscripts" msgstr "사용자 스크립트(_U)" -#: ../midori/sokoke.c:869 -msgid "User_styles" -msgstr "사용자 스타일(_S)" +#: ../midori/sokoke.c:1121 +msgid "New _Tab" +msgstr "새 탭(_T)" -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:1122 msgid "_Transfers" -msgstr "다운로드(_T)" +msgstr "전송(_T)" -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:1123 msgid "Netscape p_lugins" -msgstr "플러그인(_L)" +msgstr "넷스케이프 플러그인(_L)" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "사용자 스크립트" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "사용자 스타일" -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "" +"사용자 스크립트를 폴더%s(으)로 복사하고 사용자 스타일을 폴더 %s(으)로 복사합" +"니다." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "폴더 '%s'(을)를 감시할 수 없습니다: %s" + +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" -msgstr "북마크" +msgstr "책갈피" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:251 msgid "Edit the selected bookmark" -msgstr "" +msgstr "선택한 책갈피를 편집합니다" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:259 msgid "Delete the selected bookmark" -msgstr "" +msgstr "선택한 책갈피를 지웁니다" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:279 msgid "Add a new folder" -msgstr "" +msgstr "새 폴더를 더합니다" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:609 msgid "Separator" -msgstr "" +msgstr "구분선" #: ../panels/midori-console.c:87 msgid "Console" -msgstr "" +msgstr "콘솔" #: ../panels/midori-extensions.c:91 msgid "Extensions" @@ -1809,123 +1956,148 @@ msgstr "확장 기능" #: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "정말 모든 기록 항목을 지우시겠습니까?" #: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" -msgstr "" +msgstr "선택한 기록 항목을 책갈피에 더합니다" #: ../panels/midori-history.c:226 msgid "Delete the selected history item" -msgstr "" +msgstr "선택한 기록 항목을 지웁니다" #: ../panels/midori-history.c:234 msgid "Clear the entire history" -msgstr "" +msgstr "모든 기록 제거" + +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "잘못된 시간" + +#: ../panels/midori-history.c:599 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "시간이 잘못되어 있습니다. 현재 날짜와 시간을 확인하십시오." -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:611 msgid "A week ago" -msgstr "" +msgstr "일 주 전" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d 일 전" +msgstr[1] "%d 일 전" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:624 msgid "Today" msgstr "오늘" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:626 msgid "Yesterday" msgstr "어제" #: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" -msgstr "플러그인" +msgstr "넷스케이프 플러그인" #: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" -msgstr "" +msgstr "다운로드 폴더 열기(_F)" #: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" -msgstr "" +msgstr "연결 위치 복사(_A)" -#: ../katze/katze-http-auth.c:124 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" -msgstr "" +msgstr "인증이 필요합니다" -#: ../katze/katze-http-auth.c:140 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"다음의 위치를 열기 위해서는\n" +"사용자 이름과 암호를 입력하세요:" -#: ../katze/katze-http-auth.c:154 +#: ../katze/katze-http-auth.c:239 msgid "Username" -msgstr "" +msgstr "사용자 이름" -#: ../katze/katze-http-auth.c:170 +#: ../katze/katze-http-auth.c:252 msgid "Password" -msgstr "" +msgstr "암호" + +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "암호 기억(_R)" #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "'%s'(이)라는 이름을 가진 아이콘을 열 수 없습니다." #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +msgstr "보관된 '%s'아이콘을 열 수 없습니다." #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "" +msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:483 ../katze/katze-utils.c:874 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "" +msgstr "속성 '%s'은(는) %s에 적당하지 않음" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:529 ../katze/katze-utils.c:558 msgid "Choose file" -msgstr "" +msgstr "파일 선택" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:544 msgid "Choose folder" -msgstr "" +msgstr "폴더 선택" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "%s을(를) 위한 기본 설정" + +#: ../extensions/adblock.c:377 msgid "Configure Advertisement filters" +msgstr "광고 필터 설정" + +#: ../extensions/adblock.c:409 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." msgstr "" +"텍스트 항목에 미리 설정된 필터 목록의 주소를 입력하시고, 목록에 추가하기 위" +"해 \"추가\" 버튼을 눌러주십시오. 더 많은 목록을 %s에서 찾으실 수 있습니다." -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:549 msgid "Configure _Advertisement filters..." -msgstr "" +msgstr "광고 필터 설정(_A)..." -#: ../extensions/adblock.c:565 +#: ../extensions/adblock.c:1103 msgid "Advertisement blocker" -msgstr "" +msgstr "광고 막기" -#: ../extensions/adblock.c:566 +#: ../extensions/adblock.c:1104 msgid "Block advertisements according to a filter list" -msgstr "" - -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "" +msgstr "필터 목록에 따라 광고를 막습니다" -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" -msgstr "" +msgstr "색 있는 탭" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" -msgstr "" +msgstr "각 탭이 구분되도록 색을 칠합니다" #: ../extensions/cookie-manager/cookie-manager-page.c:79 #: ../extensions/cookie-manager/main.c:56 @@ -1941,30 +2113,32 @@ msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" +"보이는 모든 쿠키를 지웁니다. 필터가 설정되어 있으면 필터와 맞는 쿠키만 지워집" +"니다." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" -msgstr "" +msgstr "모두 펴기" #: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" -msgstr "" +msgstr "모두 접기" #: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" -msgstr "" +msgstr "정말로 모든 쿠키를 삭제하시겠습니까?" #: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" -msgstr "" +msgstr "물음" #: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." -msgstr "" +msgstr "이 필터와 맞는 쿠키만 지워집니다." #: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" -msgstr "" +msgstr "현재 세션의 끝" #: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format @@ -1978,40 +2152,42 @@ msgid "" msgstr "" "호스트: %s\n" "이름: %s\n" -"내용: %s\n" +"값: %s\n" "경로: %s\n" -"보안: %s\n" +"확인: %s\n" "만료: %s" #: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" -msgstr "" +msgstr "예" #: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" -msgstr "" +msgstr "아니오" #: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" -msgstr "" +msgstr "이름" #: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" -msgstr "" +msgstr "모두 펴기(_E)" #: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" -msgstr "" +msgstr "모두 접기(_C)" #: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" -msgstr "" +msgstr "필터:" #: ../extensions/cookie-manager/cookie-manager-page.c:928 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" msgstr "" +"이름 또는 도메인 필드가 입력된 필터와 맞는 쿠키만 보려면 필터 문자열을 입력하" +"세요" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2019,179 +2195,265 @@ msgstr "쿠키 관리자(_C)" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "" +msgstr "쿠키를 나열하거나 보거나 삭제합니다" + +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "DNS 미리읽기" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "마우스 커서를 올려놓은 링크의 IP 주소 미리 읽기" #: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "XML 데이터에서 요구된 Atom \"entry\" 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "XML 데이터에서 요구된 Atom \"feed\" 요소를 찾을 수 없습니다." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "" +msgstr "마지막 업데이트: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" -msgstr "" +msgstr "피드" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" -msgstr "" +msgstr "새 피드 더하기" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" -msgstr "" +msgstr "피드 삭제" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" -msgstr "" +msgstr "피드(_F)" #: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "" +msgstr "피드 XML 데이터에서 관리자 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." -msgstr "" +msgstr "지원하지 않은 피드 포맷." #: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "" +msgstr "XML 피드 %s을(를) 붙여널수 없습니다" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" +msgstr "RSS XML 데이터에서 \"channel\" 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "" +msgstr "지원하지 않는 RSS 버전입니다." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "XML 데이터에서 요구된 RSS \"item\" 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" +msgstr "XML 데이터에서 요구된 RSS \"channel\" 요소를 찾을 수 없습니다." #: ../extensions/feed-panel/main.c:124 msgid "Error" -msgstr "" +msgstr "오류" #: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" -msgstr "" +msgstr "피드 '%s'은(는) 이미 존재합니다." #: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" -msgstr "" +msgstr "피드 '%s'을(를) 읽어 들이는 중 오류" #: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" -msgstr "" +msgstr "피드 패널" #: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" -msgstr "" +msgstr "Atom/RSS 피드를 읽습니다" + +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "폼 값을 추가할 수 없음: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "입력된 폼 데이터 기록을 보존합니다" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "사용 불가: %s" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "리소스 파일이 설치되지 않음" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "입력 폼 기록 필터" + +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" -msgstr "" +msgstr "마우스 제스처" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "마우스의 움직임으로 미도리를 조정합니다" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "페이지 보관함" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "" +msgstr "페이지 보관함(_P)" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "현재 탭에 열려있는 하나 이상의 페이지를 페이지 보관함에 보관" + +#: ../extensions/shortcuts.c:162 msgid "Customize Keyboard shortcuts" -msgstr "" +msgstr "키보드 바로 가기 설정" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:268 msgid "Customize Sh_ortcuts..." -msgstr "" +msgstr "바로 가기 사용자 설정(_O)..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:307 msgid "Shortcuts" -msgstr "" +msgstr "바로 가기" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:308 msgid "View and edit keyboard shortcuts" -msgstr "" +msgstr "키보드 바로 가기를 보고 편집합니다" #: ../extensions/statusbar-features.c:84 msgid "Images" -msgstr "" +msgstr "그림" #: ../extensions/statusbar-features.c:96 msgid "Scripts" -msgstr "" +msgstr "스크립트" #: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" -msgstr "" +msgstr "상태 표시줄 기능" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "" +msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다" -#: ../extensions/tab-panel.c:558 ../extensions/tab-panel.c:613 +#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 msgid "Tab Panel" -msgstr "" +msgstr "탭 패널" -#: ../extensions/tab-panel.c:597 +#: ../extensions/tab-panel.c:606 msgid "T_ab Panel" -msgstr "" +msgstr "탭 패널(_A)" -#: ../extensions/tab-panel.c:614 +#: ../extensions/tab-panel.c:623 msgid "Show tabs in a vertical panel" +msgstr "탭을 수직 패널에 표시" + +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "탭 기록 목록" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" +"마지막으로 사용한 순서대로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 함" #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" -msgstr "" +msgstr "도구 모음 사용자 설정" #: ../extensions/toolbar-editor.c:407 msgid "" "Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" +"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 재배치 할 수 있습" +"니다." #: ../extensions/toolbar-editor.c:423 msgid "Available Items" -msgstr "" +msgstr "가능한 항목" #: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" -msgstr "" +msgstr "표시된 항목" #: ../extensions/toolbar-editor.c:579 msgid "Customize _Toolbar..." -msgstr "" +msgstr "도구 모음 사용자 설정(_T)..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" -msgstr "" +msgstr "도구 모음 편집기" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "도구 모음 배치를 간단히 편집합니다" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "이 플랫폼에서는 사용할 수 없음" + +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "디스크에 HTTP 통신 캐시" + +#~ msgid "Shrink images automatically" +#~ msgstr "자동으로 그림 줄임" + +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "자동으로 그림 크기를 알맞게 줄입니다" + +#~ msgid "Tint tabs distinctly" +#~ msgstr "탭 색으로 구분하기" + +#~ msgid "Remember last form inputs" +#~ msgstr "마지막으로 입력된 폼을 기억합니다" + +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "마지막으로 입력한 폼을 저장할지 결정합니다" + +#~ msgid "Cache size" +#~ msgstr "캐시 크기" + +#~ msgid "The allowed size of the cache" +#~ msgstr "허락 된 캐시의 크기" + +#~ msgid "Encoding" +#~ msgstr "인코딩" + +#~ msgid "The character encoding to use by default" +#~ msgstr "기본적으로 사용할 문자 인코딩" + +#~ msgid "MB" +#~ msgstr "MB" + +#~ msgid "User_styles" +#~ msgstr "사용자 스타일(_S)" diff --git a/po/midori.pot b/po/midori.pot index 2b0b736b..d7b9efa2 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 00:44+0200\n" +"POT-Creation-Date: 2009-11-13 19:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1435 ../midori/main.c:1609 -#: ../midori/main.c:1617 ../midori/main.c:1628 -#: ../midori/midori-websettings.c:287 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1492 ../midori/main.c:1685 +#: ../midori/main.c:1693 ../midori/main.c:1704 +#: ../midori/midori-websettings.c:289 msgid "Midori" msgstr "" @@ -46,12 +46,13 @@ msgstr "" msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:369 +#: ../midori/main.c:369 ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:401 +#: ../midori/main.c:401 ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" @@ -98,128 +99,128 @@ msgstr "" msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:993 +#: ../midori/main.c:989 ../midori/main.c:1161 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1190 +#: ../midori/main.c:1199 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1205 +#: ../midori/main.c:1214 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1209 +#: ../midori/main.c:1218 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1214 +#: ../midori/main.c:1223 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1435 +#: ../midori/main.c:1392 ../midori/main.c:1902 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1492 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1458 +#: ../midori/main.c:1515 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1490 +#: ../midori/main.c:1547 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1539 +#: ../midori/main.c:1609 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1539 +#: ../midori/main.c:1609 msgid "ADDRESS" msgstr "" -#: ../midori/main.c:1541 +#: ../midori/main.c:1612 msgid "Use FOLDER as configuration folder" msgstr "" -#: ../midori/main.c:1541 +#: ../midori/main.c:1612 msgid "FOLDER" msgstr "" -#: ../midori/main.c:1543 +#: ../midori/main.c:1615 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1546 +#: ../midori/main.c:1618 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1549 +#: ../midori/main.c:1621 msgid "Execute the specified command" msgstr "" -#: ../midori/main.c:1551 +#: ../midori/main.c:1623 msgid "Display program version" msgstr "" -#: ../midori/main.c:1553 +#: ../midori/main.c:1625 msgid "Addresses" msgstr "" -#: ../midori/main.c:1606 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1629 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1631 +#: ../midori/main.c:1707 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1711 +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1751 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1795 +#: ../midori/main.c:1869 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1813 +#: ../midori/main.c:1887 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1828 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1841 +#: ../midori/main.c:1915 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1854 +#: ../midori/main.c:1928 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1866 +#: ../midori/main.c:1940 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1882 +#: ../midori/main.c:1956 msgid "_Ignore" msgstr "" @@ -231,1132 +232,1197 @@ msgstr "" msgid "Malformed document." msgstr "" -#: ../midori/midori-array.c:432 ../midori/sokoke.c:699 +#: ../midori/midori-array.c:437 ../midori/sokoke.c:771 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4327 -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4702 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:4699 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:417 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:442 +#: ../midori/midori-browser.c:466 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:665 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:665 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:667 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:667 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:659 +#: ../midori/midori-browser.c:697 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:672 ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:710 ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:691 ../midori/midori-searchaction.c:966 +#: ../midori/midori-browser.c:729 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:710 +#: ../midori/midori-browser.c:752 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:715 ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:757 ../midori/midori-browser.c:798 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:834 +#: ../midori/midori-browser.c:876 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1211 ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:1248 ../panels/midori-transfers.c:272 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1284 #, c-format msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1252 +#: ../midori/midori-browser.c:1288 msgid "Transfer completed" msgstr "" -#: ../midori/midori-browser.c:1393 +#: ../midori/midori-browser.c:1429 msgid "Save file" msgstr "" -#: ../midori/midori-browser.c:2060 +#: ../midori/midori-browser.c:2136 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:3268 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2228 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:3523 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2251 ../midori/midori-browser.c:4743 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3847 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:824 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:3530 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3854 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:3533 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:832 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:3843 +#: ../midori/midori-browser.c:4164 msgid "Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:4168 msgid "_Clear private data" msgstr "" -#: ../midori/midori-browser.c:3860 +#: ../midori/midori-browser.c:4181 msgid "Clear the following data:" msgstr "" -#: ../midori/midori-browser.c:3870 ../midori/midori-preferences.c:665 +#: ../midori/midori-browser.c:4191 ../midori/midori-preferences.c:527 #: ../panels/midori-history.c:108 msgid "History" msgstr "" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:4196 msgid "Cookies" msgstr "" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4201 msgid "'Flash' Cookies" msgstr "" -#: ../midori/midori-browser.c:3885 +#: ../midori/midori-browser.c:4206 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:3890 ../midori/sokoke.c:873 +#: ../midori/midori-browser.c:4211 ../midori/sokoke.c:944 msgid "_Closed Tabs" msgstr "" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4219 msgid "Clear private data when _quitting Midori" msgstr "" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4315 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3995 +#: ../midori/midori-browser.c:4331 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:4261 +#: ../midori/midori-browser.c:4613 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:4263 ../midori/sokoke.c:874 +#: ../midori/midori-browser.c:4615 ../midori/sokoke.c:945 msgid "New _Window" msgstr "" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4616 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:4267 +#: ../midori/midori-browser.c:4619 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4622 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:4273 +#: ../midori/midori-browser.c:4625 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4627 msgid "Add to Speed _dial" msgstr "" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4628 msgid "Add shortcut to speed dial" msgstr "" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4630 +msgid "Add Shortcut to the _desktop" +msgstr "" + +#: ../midori/midori-browser.c:4631 +msgid "Add shortcut to the desktop" +msgstr "" + +#: ../midori/midori-browser.c:4633 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:4634 +msgid "Subscribe to this news feed" +msgstr "" + +#: ../midori/midori-browser.c:4639 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4640 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4642 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4643 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4646 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4649 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4651 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4655 +msgid "Undo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:4658 +msgid "Redo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:4662 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:4296 ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4665 ../midori/midori-browser.c:4668 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4671 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4674 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4677 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4680 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4682 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4683 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4685 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4686 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4690 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4692 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4693 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4705 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:4708 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4711 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:4343 +#: ../midori/midori-browser.c:4712 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:4345 +#: ../midori/midori-browser.c:4714 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4715 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:4348 +#: ../midori/midori-browser.c:4717 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:4718 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4722 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4724 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:4358 +#: ../midori/midori-browser.c:4727 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:4730 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4733 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:4735 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4736 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:4369 +#: ../midori/midori-browser.c:4738 msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4739 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:4374 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "" - -#: ../midori/midori-browser.c:4376 +#: ../midori/midori-browser.c:4745 msgid "Add a new _folder" msgstr "" -#: ../midori/midori-browser.c:4377 +#: ../midori/midori-browser.c:4746 msgid "Add a new bookmark folder" msgstr "" -#: ../midori/midori-browser.c:4379 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4748 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4749 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:4383 +#: ../midori/midori-browser.c:4752 msgid "_Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4753 msgid "Clear private data..." msgstr "" -#: ../midori/midori-browser.c:4388 +#: ../midori/midori-browser.c:4757 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4758 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:4391 +#: ../midori/midori-browser.c:4760 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:4392 +#: ../midori/midori-browser.c:4761 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:4394 +#: ../midori/midori-browser.c:4763 +msgid "Focus _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:4764 +msgid "Focus the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4766 +msgid "Open last _session" +msgstr "" + +#: ../midori/midori-browser.c:4767 +msgid "Open the tabs saved in the last session" +msgstr "" + +#: ../midori/midori-browser.c:4769 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4771 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:4772 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:4399 +#: ../midori/midori-browser.c:4774 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4775 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4777 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:4403 +#: ../midori/midori-browser.c:4778 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:4781 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:4413 +#: ../midori/midori-browser.c:4788 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:4789 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:4419 +#: ../midori/midori-browser.c:4794 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4795 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:4423 +#: ../midori/midori-browser.c:4798 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:4424 +#: ../midori/midori-browser.c:4799 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:4427 +#: ../midori/midori-browser.c:4802 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:4428 +#: ../midori/midori-browser.c:4803 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:4431 +#: ../midori/midori-browser.c:4806 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:4432 +#: ../midori/midori-browser.c:4807 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4810 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:4436 +#: ../midori/midori-browser.c:4811 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:4439 +#: ../midori/midori-browser.c:4814 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4815 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:4447 +#: ../midori/midori-browser.c:4822 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:4450 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4825 ../midori/midori-websettings.c:215 msgid "Chinese (BIG5)" msgstr "" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4454 +#: ../midori/midori-browser.c:4829 msgid "Japanese (SHIFT__JIS)" msgstr "" -#: ../midori/midori-browser.c:4457 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4832 ../midori/midori-websettings.c:217 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:4835 ../midori/midori-websettings.c:218 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:4460 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:4838 ../midori/midori-websettings.c:219 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:4463 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:4841 ../midori/midori-websettings.c:220 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:4466 ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:4844 ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:294 ../katze/katze-utils.c:571 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5331 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5338 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:5340 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5364 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5366 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5387 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5402 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5404 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4995 ../midori/sokoke.c:862 +#: ../midori/midori-browser.c:5419 ../midori/sokoke.c:934 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5421 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5436 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5448 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5450 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5464 msgid "_Menu" msgstr "" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5466 msgid "Menu" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5657 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5688 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:5693 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5698 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5707 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:5281 +#: ../midori/midori-browser.c:5719 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:5316 ../panels/midori-transfers.c:143 +#: ../midori/midori-browser.c:5763 ../panels/midori-transfers.c:143 msgid "Clear All" msgstr "" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:6118 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-locationaction.c:941 +#: ../midori/midori-locationaction.c:979 #, c-format msgid "Search with %s" msgstr "" -#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:415 ../midori/midori-panel.c:417 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:427 ../midori/midori-panel.c:429 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "" -#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:439 ../midori/midori-panel.c:440 msgid "Close panel" msgstr "" -#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:697 msgid "Show panel _titles" msgstr "" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:704 msgid "Show operating _controls" msgstr "" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:793 msgid "Options" msgstr "" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:198 msgid "Show Blank page" msgstr "" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Show last open tabs" msgstr "" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:216 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons and text" msgstr "" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 msgid "Text beside icons" msgstr "" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:274 ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:551 ../extensions/shortcuts.c:94 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 +msgid "iPhone" +msgstr "" + +#: ../midori/midori-websettings.c:292 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:346 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:347 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:355 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:356 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:364 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:365 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:390 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:391 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:400 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:401 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:409 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:410 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:419 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:420 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:428 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:429 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:437 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:438 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:446 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:447 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:462 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:471 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:481 msgid "Toolbar Style:" msgstr "" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:482 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:498 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:499 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:514 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:515 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:523 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:524 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:532 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:533 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:548 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:549 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:564 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:565 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:574 msgid "When Midori starts:" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:575 msgid "What to do when Midori starts" msgstr "" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:584 msgid "Homepage:" msgstr "" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:585 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:600 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:601 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:617 msgid "Show speed dial in new tabs" msgstr "" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:618 msgid "Show speed dial in newly opened tabs" msgstr "" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:626 msgid "Save downloaded files to:" msgstr "" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:627 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:648 msgid "Ask for the destination folder" msgstr "" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:649 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:668 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:669 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:681 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:682 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:690 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:691 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:706 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:707 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:719 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:720 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:728 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:729 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:739 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:740 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:748 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:749 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:757 msgid "Open new pages in:" msgstr "" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:758 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:771 msgid "Open external pages in:" msgstr "" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:772 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:785 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:786 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:794 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:795 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:803 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:804 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:812 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:813 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:823 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:824 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:831 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-websettings.c:832 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:839 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "" + +#: ../midori/midori-websettings.c:840 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:855 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:856 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:871 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:872 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:887 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:888 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:896 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:897 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:906 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:907 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:915 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:916 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:926 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:927 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:935 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:936 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "" - -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:944 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:945 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:955 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:956 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:971 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:972 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:988 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:989 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1005 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1006 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1021 msgid "Clear private data" msgstr "" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1022 msgid "The private data selected for deletion" msgstr "" @@ -1364,334 +1430,331 @@ msgstr "" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:782 ../midori/midori-view.c:3043 -#: ../midori/midori-view.c:3047 +#: ../midori/midori-view.c:911 ../midori/midori-view.c:3773 +#: ../midori/midori-view.c:3777 #, c-format msgid "Error - %s" msgstr "" -#: ../midori/midori-view.c:783 +#: ../midori/midori-view.c:912 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "" -#: ../midori/midori-view.c:788 +#: ../midori/midori-view.c:917 msgid "Try again" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:821 +#: ../midori/midori-view.c:950 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1218 +#: ../midori/midori-view.c:1164 ../midori/midori-view.c:1878 +#, c-format +msgid "Send a message to %s" +msgstr "" + +#: ../midori/midori-view.c:1717 ../midori/midori-view.c:1780 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:1220 +#: ../midori/midori-view.c:1720 ../midori/midori-view.c:1782 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1723 ../midori/midori-view.c:1789 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1243 -msgid "_Download Link destination" +#: ../midori/midori-view.c:1726 +msgid "_Copy Link destination" msgstr "" -#: ../midori/midori-view.c:1249 +#: ../midori/midori-view.c:1729 ../midori/midori-view.c:1801 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1730 ../midori/midori-view.c:1795 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:1734 ../midori/midori-view.c:1770 +#: ../midori/midori-view.c:1806 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:1287 +#: ../midori/midori-view.c:1746 +msgid "Open _Image in New Tab" +msgstr "" + +#: ../midori/midori-view.c:1749 +msgid "Open Image in New Wi_ndow" +msgstr "" + +#: ../midori/midori-view.c:1752 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:1755 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:1756 +msgid "Download I_mage" +msgstr "" + +#: ../midori/midori-view.c:1763 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:1766 +msgid "Save _Video" +msgstr "" + +#: ../midori/midori-view.c:1766 +msgid "Download _Video" +msgstr "" + +#: ../midori/midori-view.c:1826 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:1319 +#: ../midori/midori-view.c:1854 ../midori/midori-view.c:1865 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1886 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:2145 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1524 +#: ../midori/midori-view.c:2162 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:2165 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1531 +#: ../midori/midori-view.c:2169 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1981 +#: ../midori/midori-view.c:2685 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2896 msgid "Speed dial" msgstr "" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2897 msgid "Click to add a shortcut" msgstr "" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2898 msgid "Enter shortcut address" msgstr "" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2899 msgid "Enter shortcut title" msgstr "" -#: ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2900 msgid "Are you sure you want to delete this shortcut?" msgstr "" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2930 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2947 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:3072 msgid "Blank page" msgstr "" -#: ../midori/midori-view.c:2581 ../midori/sokoke.c:870 -msgid "New _Tab" -msgstr "" - -#: ../midori/midori-view.c:2595 +#: ../midori/midori-view.c:3315 msgid "_Duplicate Tab" msgstr "" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3320 msgid "_Restore Tab" msgstr "" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3320 msgid "_Minimize Tab" msgstr "" -#: ../midori/midori-view.c:3149 +#: ../midori/midori-view.c:3879 msgid "Print background images" msgstr "" -#: ../midori/midori-view.c:3150 +#: ../midori/midori-view.c:3880 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:3194 ../midori/midori-preferences.c:484 +#: ../midori/midori-view.c:3924 ../midori/midori-preferences.c:388 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "" - #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:317 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:318 msgid "Startup" msgstr "" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:332 msgid "Use current page as homepage" msgstr "" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:341 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:356 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:357 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:359 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:362 msgid "The default font family used to display text" msgstr "" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:365 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:367 msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:370 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:373 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:375 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:378 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:387 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "" - -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:400 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:401 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:499 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "" - -#: ../midori/midori-preferences.c:500 -msgid "Enable embedded scripting languages" -msgstr "" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded Netscape plugin objects" -msgstr "" - -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:413 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:414 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:417 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:418 msgid "Enable special extensions for developers" msgstr "" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:428 msgid "Spell Checking" msgstr "" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:430 msgid "Enable Spell Checking" msgstr "" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:431 msgid "Enable spell checking while typing" msgstr "" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:435 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:443 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:444 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:544 +#: ../midori/midori-preferences.c:454 msgid "Browsing" msgstr "" #. Page "Applications" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:476 msgid "Applications" msgstr "" -#: ../midori/midori-preferences.c:569 +#: ../midori/midori-preferences.c:477 msgid "External applications" msgstr "" #. Page "Network" -#: ../midori/midori-preferences.c:615 ../midori/midori-preferences.c:616 +#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:494 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:643 -msgid "MB" -msgstr "" - #. Page "Privacy" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:662 ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:525 ../midori/midori-preferences.c:532 msgid "days" msgstr "" @@ -1727,58 +1790,68 @@ msgstr "" msgid "Use as _default" msgstr "" -#: ../midori/sokoke.c:166 ../midori/sokoke.c:178 +#: ../midori/sokoke.c:167 msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:933 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:935 msgid "Add Boo_kmark" msgstr "" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:936 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:937 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:938 msgid "_History" msgstr "" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:939 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:940 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:869 -msgid "User_styles" +#: ../midori/sokoke.c:941 +msgid "New _Tab" msgstr "" -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:942 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:943 msgid "Netscape p_lugins" msgstr "" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "" + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + #: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "" @@ -1823,22 +1896,31 @@ msgstr "" msgid "Clear the entire history" msgstr "" +#: ../panels/midori-history.c:600 +msgid "Erroneous clock time" +msgstr "" + #: ../panels/midori-history.c:601 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" + +#: ../panels/midori-history.c:613 msgid "A week ago" msgstr "" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:618 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "" msgstr[1] "" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:626 msgid "Today" msgstr "" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:628 msgid "Yesterday" msgstr "" @@ -1854,24 +1936,28 @@ msgstr "" msgid "Copy Link Loc_ation" msgstr "" -#: ../katze/katze-http-auth.c:124 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "" -#: ../katze/katze-http-auth.c:140 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../katze/katze-http-auth.c:154 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "" -#: ../katze/katze-http-auth.c:170 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1886,32 +1972,44 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:393 ../katze/katze-utils.c:769 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:468 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:454 msgid "Choose folder" msgstr "" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#: ../extensions/adblock.c:345 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:375 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" + +#: ../extensions/adblock.c:513 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:565 +#: ../extensions/adblock.c:922 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:566 +#: ../extensions/adblock.c:923 msgid "Block advertisements according to a filter list" msgstr "" @@ -2015,6 +2113,14 @@ msgstr "" msgid "List, view and delete cookies" msgstr "" +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "" + #: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2030,19 +2136,19 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "" @@ -2099,11 +2205,33 @@ msgstr "" msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:246 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures/main.c:247 msgid "Control Midori by moving the mouse" msgstr "" @@ -2116,19 +2244,23 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "" + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "" -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "" @@ -2148,18 +2280,26 @@ msgstr "" msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:558 ../extensions/tab-panel.c:613 +#: ../extensions/tab-panel.c:562 ../extensions/tab-panel.c:619 msgid "Tab Panel" msgstr "" -#: ../extensions/tab-panel.c:597 +#: ../extensions/tab-panel.c:603 msgid "T_ab Panel" msgstr "" -#: ../extensions/tab-panel.c:614 +#: ../extensions/tab-panel.c:620 msgid "Show tabs in a vertical panel" msgstr "" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "" @@ -2182,10 +2322,22 @@ msgstr "" msgid "Customize _Toolbar..." msgstr "" -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" msgstr "" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "" + +#: ../extensions/web-cache.c:583 +msgid "Web Cache" +msgstr "" + +#: ../extensions/web-cache.c:584 +msgid "Cache HTTP communication on disk" +msgstr "" diff --git a/po/no.po b/po/no.po new file mode 100644 index 00000000..387d06d0 --- /dev/null +++ b/po/no.po @@ -0,0 +1,2295 @@ +# Norwegian Bokmal translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Per Kongstad 2009 +# Olav Andreas Lindekleiv +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-07-29 23:58+0200\n" +"PO-Revision-Date: 2009-11-01 20:08+0100\n" +"Last-Translator: Olav Andreas Lindekleiv \n" +"Language-Team: Norsk Bokmål \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Lettvektig nettleser" + +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1343 +#: ../midori/main.c:1517 +#: ../midori/main.c:1525 +#: ../midori/main.c:1536 +#: ../midori/midori-websettings.c:287 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Nettleser" + +#: ../midori/main.c:96 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Innstillingen kunne ikke lastes: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Verdien '%s' er ikke gyldig for %s" + +#: ../midori/main.c:158 +#: ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Ugyldig innstillingsverdi '%s'" + +#: ../midori/main.c:350 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Klarte ikke åpne databasen: %s\n" + +#: ../midori/main.c:382 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Klarte ikke kjøre databaseuttrykk: %s\n" + +#: ../midori/main.c:436 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Klarte ikke fjerne historikkelementet: %s\n" + +#: ../midori/main.c:460 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Klarte ikke tømme historikken: %s\n" + +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Klarte ikke legge til historikkelementet: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:712 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Klarte ikke fjerne gamle historikkelementer: %s\n" + +#: ../midori/main.c:741 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Innstillingen kan ikke lagres. %s" + +#: ../midori/main.c:779 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Søkemotorene kan ikke lagres. %s" + +#: ../midori/main.c:798 +#: ../midori/main.c:826 +#: ../midori/main.c:855 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bokmerkene kan ikke lagres. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:878 +#: ../midori/main.c:901 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papirkurven kan ikke lagres. %s" + +#: ../midori/main.c:974 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sesjonen kan ikke lagres. %s" + +#: ../midori/main.c:1101 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Det ser ut til at Midori kan ha kræsjet forrige gang den kjørte. Hvis dette skjer ofte, prøv en av følgende valg for å løse problemet" + +#: ../midori/main.c:1116 +msgid "Modify _preferences" +msgstr "Endre _innstillinger" + +#: ../midori/main.c:1120 +msgid "Reset the last _session" +msgstr "Restart siste _sesjon" + +#: ../midori/main.c:1125 +msgid "Disable all _extensions" +msgstr "Slå av alle _utvidelser" + +#: ../midori/main.c:1343 +msgid "No filename specified" +msgstr "Ingen filnavn oppgitt" + +#: ../midori/main.c:1366 +msgid "An unknown error occured." +msgstr "Det skjedde en ukjent feil." + +#: ../midori/main.c:1398 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Øyeblikksbilde lagret til: %s\n" + +#: ../midori/main.c:1447 +msgid "Run ADDRESS as a web application" +msgstr "Kjør ADRESSE som et webprogram" + +#: ../midori/main.c:1447 +msgid "ADDRESS" +msgstr "ADRESSE" + +#: ../midori/main.c:1449 +msgid "Use FOLDER as configuration folder" +msgstr "Bruk MAPPE som innstillingsmappe" + +#: ../midori/main.c:1449 +msgid "FOLDER" +msgstr "MAPPE" + +#: ../midori/main.c:1451 +msgid "Run the specified filename as javascript" +msgstr "Kjør det anngitte filnavn som javascript" + +#: ../midori/main.c:1454 +msgid "Take a snapshot of the specified URI" +msgstr "Ta et øyeblikksbilde av den oppgitte URI" + +#: ../midori/main.c:1457 +msgid "Execute the specified command" +msgstr "Kjør den angitte kommandoen" + +#: ../midori/main.c:1459 +msgid "Display program version" +msgstr "Vis programversion" + +#: ../midori/main.c:1461 +msgid "Addresses" +msgstr "Adresser" + +#: ../midori/main.c:1514 +msgid "[Addresses]" +msgstr "[Adresser]" + +#: ../midori/main.c:1537 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Vennligst rapporter kommentarer, forslag og feil til:" + +#: ../midori/main.c:1539 +msgid "Check for new versions at:" +msgstr "Se etter nye versjoner på:" + +#: ../midori/main.c:1619 +msgid "The specified configuration folder is invalid." +msgstr "Den angitte konfigurasjonsmappen er ugyldig." + +#: ../midori/main.c:1655 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "En instans av Midori kjører allerede, men svarer ikke.\n" + +#: ../midori/main.c:1715 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Søkemotorene kan ikke lastes inn. %s\n" + +#: ../midori/main.c:1727 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Bokmerkene kan ikke lastes inn: %s\n" + +#: ../midori/main.c:1742 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesjonen kan ikke lastes inn: %s\n" + +#: ../midori/main.c:1755 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Papirkurven kan ikke lastes inn: %s\n" + +#: ../midori/main.c:1768 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Historikken kan ikke lastes inn: %s\n" + +#: ../midori/main.c:1780 +msgid "The following errors occured:" +msgstr "Følgende feil oppstod:" + +#: ../midori/main.c:1796 +msgid "_Ignore" +msgstr "_Ignorer" + +#: ../midori/midori-array.c:250 +msgid "File not found." +msgstr "Fil ble ikke funnet." + +#: ../midori/midori-array.c:258 +#: ../midori/midori-array.c:267 +msgid "Malformed document." +msgstr "Feil med dokument." + +#: ../midori/midori-array.c:429 +#: ../midori/sokoke.c:694 +#, c-format +msgid "Writing failed." +msgstr "Skriving feilet." + +#: ../midori/midori-browser.c:307 +#: ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:4235 +msgid "Reload the current page" +msgstr "Oppdater denne siden" + +#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:4232 +msgid "Stop loading the current page" +msgstr "Stopp innlastingen av denne siden" + +#: ../midori/midori-browser.c:409 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% lastet" + +#: ../midori/midori-browser.c:434 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Uventet handling '%s'." + +#: ../midori/midori-browser.c:616 +msgid "New folder" +msgstr "Ny mappe" + +#: ../midori/midori-browser.c:616 +msgid "Edit folder" +msgstr "Rediger mappe" + +#: ../midori/midori-browser.c:618 +msgid "New bookmark" +msgstr "Nytt bokmerke" + +#: ../midori/midori-browser.c:618 +msgid "Edit bookmark" +msgstr "Rediger bokmerke" + +#: ../midori/midori-browser.c:648 +msgid "_Title:" +msgstr "_Tittel:" + +#: ../midori/midori-browser.c:661 +#: ../midori/midori-searchaction.c:952 +msgid "_Description:" +msgstr "_Beskrivelse:" + +#: ../midori/midori-browser.c:680 +#: ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:343 +msgid "_Address:" +msgstr "_Adresse:" + +#: ../midori/midori-browser.c:699 +msgid "_Folder:" +msgstr "_Mappe:" + +#: ../midori/midori-browser.c:704 +#: ../midori/midori-browser.c:745 +msgid "Toplevel folder" +msgstr "Øverste mappe" + +#: ../midori/midori-browser.c:821 +msgid "Save file as" +msgstr "Lagre fil som" + +#: ../midori/midori-browser.c:1172 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Filen '%s' har blitt lastet ned." + +#: ../midori/midori-browser.c:1176 +msgid "Transfer completed" +msgstr "Overføring er ferdig" + +#: ../midori/midori-browser.c:1317 +msgid "Save file" +msgstr "Lagre fil" + +#: ../midori/midori-browser.c:1984 +msgid "Open file" +msgstr "Åpne fil" + +#: ../midori/midori-browser.c:3430 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 +msgid "Open all in _Tabs" +msgstr "Åpne alt i _faner" + +#: ../midori/midori-browser.c:3437 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 +#: ../extensions/feed-panel/feed-panel.c:542 +msgid "Open in New _Tab" +msgstr "Åpne i ny _fane" + +#: ../midori/midori-browser.c:3440 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 +#: ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Window" +msgstr "Åpne i nytt _vindu" + +#: ../midori/midori-browser.c:3750 +msgid "Clear Private Data" +msgstr "Slett private data" + +#: ../midori/midori-browser.c:3754 +msgid "_Clear private data" +msgstr "_Slett private data" + +#: ../midori/midori-browser.c:3767 +msgid "Clear the following data:" +msgstr "Slett følgende data:" + +#: ../midori/midori-browser.c:3777 +#: ../midori/midori-preferences.c:671 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historikk" + +#: ../midori/midori-browser.c:3782 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3787 +msgid "'Flash' Cookies" +msgstr "'Flash' cookies" + +#: ../midori/midori-browser.c:3792 +msgid "Website icons" +msgstr "Nettsideikoner" + +#: ../midori/midori-browser.c:3797 +#: ../midori/sokoke.c:868 +msgid "_Closed Tabs" +msgstr "_Lukk fane" + +#: ../midori/midori-browser.c:3805 +msgid "Clear private data when _quitting Midori" +msgstr "_Slett private data når Midori _avsluttes" + +#: ../midori/midori-browser.c:3889 +msgid "A lightweight web browser." +msgstr "En lettvektig nettleser" + +#: ../midori/midori-browser.c:3897 +msgid "translator-credits" +msgstr "" +"Olav Andreas Lindekleiv \n" +"\n" +"Kontakt og mer info: http://lindekleiv.com/" + +#: ../midori/midori-browser.c:4163 +msgid "_File" +msgstr "_Fil" + +#: ../midori/midori-browser.c:4165 +#: ../midori/sokoke.c:869 +msgid "New _Window" +msgstr "Nytt _vindu" + +#: ../midori/midori-browser.c:4166 +msgid "Open a new window" +msgstr "Åpne nytt vindu" + +#: ../midori/midori-browser.c:4169 +msgid "Open a new tab" +msgstr "Åpne ny fane" + +#: ../midori/midori-browser.c:4172 +msgid "Open a file" +msgstr "Åpne en fil" + +#: ../midori/midori-browser.c:4175 +msgid "Save to a file" +msgstr "Lagre til fil" + +#: ../midori/midori-browser.c:4177 +msgid "Add to Speed _dial" +msgstr "Legg til Speed _dial" + +#: ../midori/midori-browser.c:4178 +msgid "Add shortcut to speed dial" +msgstr "Legg til snarvei på Speed dial" + +#: ../midori/midori-browser.c:4180 +msgid "_Close Tab" +msgstr "_Lukk fane" + +#: ../midori/midori-browser.c:4181 +msgid "Close the current tab" +msgstr "Lukk denne fanen" + +#: ../midori/midori-browser.c:4183 +msgid "C_lose Window" +msgstr "Lu_kk vindu" + +#: ../midori/midori-browser.c:4184 +msgid "Close this window" +msgstr "Lukk dette vinduet" + +#: ../midori/midori-browser.c:4187 +msgid "Print the current page" +msgstr "Skriv ut denne siden" + +#: ../midori/midori-browser.c:4190 +msgid "Quit the application" +msgstr "Avslutt programmet" + +#: ../midori/midori-browser.c:4192 +msgid "_Edit" +msgstr "_Rediger" + +#: ../midori/midori-browser.c:4195 +msgid "Cut the selected text" +msgstr "Klipp ut markert tekst" + +#: ../midori/midori-browser.c:4198 +#: ../midori/midori-browser.c:4201 +msgid "Copy the selected text" +msgstr "Kopier markert tekst" + +#: ../midori/midori-browser.c:4204 +msgid "Paste text from the clipboard" +msgstr "Lim inn" + +#: ../midori/midori-browser.c:4207 +msgid "Delete the selected text" +msgstr "Slett markert tekst" + +#: ../midori/midori-browser.c:4210 +msgid "Select all text" +msgstr "Marker hele teksten" + +#: ../midori/midori-browser.c:4213 +msgid "Find a word or phrase in the page" +msgstr "Finn et ord eller en frase fra siden" + +#: ../midori/midori-browser.c:4215 +msgid "Find _Next" +msgstr "Finn _neste" + +#: ../midori/midori-browser.c:4216 +msgid "Find the next occurrence of a word or phrase" +msgstr "Finn neste forekomst av et ord eller frase" + +#: ../midori/midori-browser.c:4218 +msgid "Find _Previous" +msgstr "Finn _forrige" + +#: ../midori/midori-browser.c:4219 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Finn forrige forekomst av et ord eller frase" + +#: ../midori/midori-browser.c:4223 +msgid "Configure the application preferences" +msgstr "Endre programvalg" + +#: ../midori/midori-browser.c:4225 +msgid "_View" +msgstr "_Vis" + +#: ../midori/midori-browser.c:4226 +msgid "_Toolbars" +msgstr "_Verktøymenyer" + +#: ../midori/midori-browser.c:4238 +msgid "Increase the zoom level" +msgstr "Mer zoom" + +#: ../midori/midori-browser.c:4241 +msgid "Decrease the zoom level" +msgstr "Mindre zoom" + +#: ../midori/midori-browser.c:4244 +msgid "Reset the zoom level" +msgstr "Nullstill zoom" + +#: ../midori/midori-browser.c:4245 +msgid "_Encoding" +msgstr "_Kodning" + +#: ../midori/midori-browser.c:4247 +msgid "View So_urce" +msgstr "Vis _kilde" + +#: ../midori/midori-browser.c:4248 +msgid "View the source code of the page" +msgstr "Vis kildekode for siden" + +#: ../midori/midori-browser.c:4250 +msgid "View Selection Source" +msgstr "Vis kilde for markert område" + +#: ../midori/midori-browser.c:4251 +msgid "View the source code of the selection" +msgstr "Vis kildekode for markert område" + +#: ../midori/midori-browser.c:4255 +msgid "Toggle fullscreen view" +msgstr "Slå av/på fullskjermvisning" + +#: ../midori/midori-browser.c:4257 +msgid "_Go" +msgstr "_Gå til" + +#: ../midori/midori-browser.c:4260 +msgid "Go back to the previous page" +msgstr "Gå til forrige side" + +#: ../midori/midori-browser.c:4263 +msgid "Go forward to the next page" +msgstr "Gå til neste side" + +#: ../midori/midori-browser.c:4266 +msgid "Go to your homepage" +msgstr "Gå til hjemmesiden din" + +#: ../midori/midori-browser.c:4268 +msgid "Empty Trash" +msgstr "Tøm papirkurven" + +#: ../midori/midori-browser.c:4269 +msgid "Delete the contents of the trash" +msgstr "Slett innhold i papirkurven" + +#: ../midori/midori-browser.c:4271 +msgid "Undo _Close Tab" +msgstr "Angre _lukking av fane" + +#: ../midori/midori-browser.c:4272 +msgid "Open the last closed tab" +msgstr "Åpne forrige fane du lukket" + +#: ../midori/midori-browser.c:4276 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Legg til nytt bokmerke" + +#: ../midori/midori-browser.c:4278 +msgid "Add a new _folder" +msgstr "Legg til ny _mappe" + +#: ../midori/midori-browser.c:4279 +msgid "Add a new bookmark folder" +msgstr "Legg til ny bokmerkemappe" + +#: ../midori/midori-browser.c:4281 +#: ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" +msgstr "_Håndter søkemotorer" + +#: ../midori/midori-browser.c:4282 +msgid "Add, edit and remove search engines..." +msgstr "Legg til, endre og fjern søkemotorer..." + +#: ../midori/midori-browser.c:4285 +msgid "_Clear Private Data" +msgstr "_Slett private data" + +#: ../midori/midori-browser.c:4286 +msgid "Clear private data..." +msgstr "Slett private data..." + +#: ../midori/midori-browser.c:4290 +msgid "_Previous Tab" +msgstr "_Forrige fane" + +#: ../midori/midori-browser.c:4291 +msgid "Switch to the previous tab" +msgstr "Bytt til forrige fane" + +#: ../midori/midori-browser.c:4293 +msgid "_Next Tab" +msgstr "_Neste fane" + +#: ../midori/midori-browser.c:4294 +msgid "Switch to the next tab" +msgstr "Bytt til neste fane" + +#: ../midori/midori-browser.c:4296 +msgid "_Help" +msgstr "_Hjelp" + +#: ../midori/midori-browser.c:4298 +msgid "_Contents" +msgstr "_Innhold" + +#: ../midori/midori-browser.c:4299 +msgid "Show the documentation" +msgstr "Vis dokumentasjon" + +#: ../midori/midori-browser.c:4301 +msgid "_Frequent Questions" +msgstr "_Ofte stilte spørsmål" + +#: ../midori/midori-browser.c:4302 +msgid "Show the Frequently Asked Questions" +msgstr "Vis ofte stilte spørsmål" + +#: ../midori/midori-browser.c:4304 +msgid "_Report a Bug" +msgstr "_Rapporter en feil" + +#: ../midori/midori-browser.c:4305 +msgid "Open Midori's bug tracker" +msgstr "Åpne Midoris feilsystem" + +#: ../midori/midori-browser.c:4308 +msgid "Show information about the program" +msgstr "Vis informasjon om programmet" + +#: ../midori/midori-browser.c:4315 +msgid "P_rivate Browsing" +msgstr "P_rivat surfing" + +#: ../midori/midori-browser.c:4316 +msgid "Don't save any private data while browsing" +msgstr "Ikke lagre noe privat data under surfingen" + +#: ../midori/midori-browser.c:4321 +msgid "_Menubar" +msgstr "_Menylinje" + +#: ../midori/midori-browser.c:4322 +msgid "Show menubar" +msgstr "Vis menylinje" + +#: ../midori/midori-browser.c:4325 +msgid "_Navigationbar" +msgstr "_Navigasjonslinje" + +#: ../midori/midori-browser.c:4326 +msgid "Show navigationbar" +msgstr "Vis navigasjonslinje" + +#: ../midori/midori-browser.c:4329 +msgid "Side_panel" +msgstr "Side_panel" + +#: ../midori/midori-browser.c:4330 +msgid "Show sidepanel" +msgstr "Vis sidepanel" + +#: ../midori/midori-browser.c:4333 +msgid "_Bookmarkbar" +msgstr "_Bokmerkelinje" + +#: ../midori/midori-browser.c:4334 +msgid "Show bookmarkbar" +msgstr "Vis bokmerkelinje" + +#: ../midori/midori-browser.c:4337 +msgid "_Transferbar" +msgstr "_Overføringer" + +#: ../midori/midori-browser.c:4338 +msgid "Show transferbar" +msgstr "Vis overføringer" + +#: ../midori/midori-browser.c:4341 +msgid "_Statusbar" +msgstr "_Statuslinje" + +#: ../midori/midori-browser.c:4342 +msgid "Show statusbar" +msgstr "Vis statuslinje" + +#: ../midori/midori-browser.c:4349 +msgid "_Automatic" +msgstr "_Automatisk" + +#: ../midori/midori-browser.c:4352 +#: ../midori/midori-websettings.c:214 +msgid "Chinese (BIG5)" +msgstr "Kinesisk (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4356 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japansk (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4359 +#: ../midori/midori-websettings.c:216 +msgid "Russian (KOI8-R)" +msgstr "Russisk (KOI8-R)" + +#: ../midori/midori-browser.c:4362 +#: ../midori/midori-websettings.c:217 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:4365 +#: ../midori/midori-websettings.c:218 +msgid "Western (ISO-8859-1)" +msgstr "Vestlig (ISO-8859-1)" + +#: ../midori/midori-browser.c:4368 +#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:291 +msgid "Custom..." +msgstr "Tilpasset..." + +#: ../midori/midori-browser.c:4806 +msgid "_Separator" +msgstr "_Separator" + +#: ../midori/midori-browser.c:4813 +msgid "_Location..." +msgstr "_Sted..." + +#: ../midori/midori-browser.c:4815 +msgid "Open a particular location" +msgstr "Åpne et gitt sted" + +#: ../midori/midori-browser.c:4839 +msgid "_Web Search..." +msgstr "_Nettsøk..." + +#: ../midori/midori-browser.c:4841 +msgid "Run a web search" +msgstr "Kjør et nettsøk" + +#: ../midori/midori-browser.c:4862 +msgid "Reopen a previously closed tab or window" +msgstr "Gjenåpne en tidligere lukket fane eller vindu" + +#: ../midori/midori-browser.c:4877 +msgid "_Recently visited pages" +msgstr "_Nylig besøkte nettsider" + +#: ../midori/midori-browser.c:4879 +msgid "Reopen pages that you visited earlier" +msgstr "Gjenåpne sider du har besøkt tidligere" + +#: ../midori/midori-browser.c:4894 +#: ../midori/sokoke.c:857 +msgid "_Bookmarks" +msgstr "_Bokmerker" + +#: ../midori/midori-browser.c:4896 +msgid "Show the saved bookmarks" +msgstr "Vis lagrede bokmerker" + +#: ../midori/midori-browser.c:4911 +msgid "_Tools" +msgstr "Verk_tøy" + +#: ../midori/midori-browser.c:4923 +msgid "_Window" +msgstr "_Vindu" + +#: ../midori/midori-browser.c:4925 +msgid "Show a list of all open tabs" +msgstr "Vis en liste med alle åpne faner" + +#: ../midori/midori-browser.c:4939 +msgid "_Menu" +msgstr "_Meny" + +#: ../midori/midori-browser.c:4941 +msgid "Menu" +msgstr "Meny" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:5127 +msgid "_Inline Find:" +msgstr "_Inlinesøk:" + +#: ../midori/midori-browser.c:5152 +msgid "Previous" +msgstr "Forrige" + +#: ../midori/midori-browser.c:5157 +msgid "Next" +msgstr "Neste" + +#: ../midori/midori-browser.c:5162 +msgid "Match Case" +msgstr "Skill mellom store og små bokstaver" + +#: ../midori/midori-browser.c:5170 +msgid "Highlight Matches" +msgstr "Fremhev treff" + +#: ../midori/midori-browser.c:5180 +msgid "Close Findbar" +msgstr "Lukk søkelinje" + +#: ../midori/midori-browser.c:5215 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Slett alle" + +#: ../midori/midori-browser.c:5552 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Uventet innstilling '%s'" + +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Søk med %s" + +#: ../midori/midori-panel.c:382 +#: ../midori/midori-panel.c:384 +msgid "Detach chosen panel from the window" +msgstr "Frigjør valgt panel fra vinduet" + +#: ../midori/midori-panel.c:394 +#: ../midori/midori-panel.c:396 +#: ../midori/midori-panel.c:577 +#: ../midori/midori-panel.c:580 +msgid "Align sidepanel to the right" +msgstr "Flytt sidepanel til høyre" + +#: ../midori/midori-panel.c:406 +#: ../midori/midori-panel.c:407 +msgid "Close panel" +msgstr "Lukk panel" + +#: ../midori/midori-panel.c:578 +#: ../midori/midori-panel.c:581 +msgid "Align sidepanel to the left" +msgstr "Flytt sidepanel til venstre" + +#: ../midori/midori-panel.c:704 +msgid "Show panel _titles" +msgstr "Vis panel_titler" + +#: ../midori/midori-panel.c:712 +msgid "Show operating _controls" +msgstr "Vis handlings_kontroller" + +#: ../midori/midori-panel.c:783 +msgid "Options" +msgstr "Innstillinger" + +#: ../midori/midori-websettings.c:197 +msgid "Show Blank page" +msgstr "Vis tom side" + +#: ../midori/midori-websettings.c:198 +msgid "Show Homepage" +msgstr "Vis hjemmeside" + +#: ../midori/midori-websettings.c:199 +msgid "Show last open tabs" +msgstr "Vis sist brukte faner" + +#: ../midori/midori-websettings.c:215 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japansk (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:234 +msgid "New tab" +msgstr "Ny fane" + +#: ../midori/midori-websettings.c:235 +msgid "New window" +msgstr "Nytt vindu" + +#: ../midori/midori-websettings.c:236 +msgid "Current tab" +msgstr "Nåværende fane" + +#: ../midori/midori-websettings.c:251 +msgid "Default" +msgstr "Standard" + +#: ../midori/midori-websettings.c:252 +msgid "Icons" +msgstr "Ikoner" + +#: ../midori/midori-websettings.c:253 +msgid "Text" +msgstr "Tekst" + +#: ../midori/midori-websettings.c:254 +msgid "Icons and text" +msgstr "Ikoner og tekst" + +#: ../midori/midori-websettings.c:255 +msgid "Text beside icons" +msgstr "Tekst ved siden av ikoner" + +#: ../midori/midori-websettings.c:270 +msgid "All cookies" +msgstr "Alle cookies" + +#: ../midori/midori-websettings.c:271 +msgid "Session cookies" +msgstr "Session-cookies" + +#: ../midori/midori-websettings.c:272 +#: ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:93 +msgid "None" +msgstr "Ingen" + +#: ../midori/midori-websettings.c:288 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:289 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:290 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:343 +msgid "Remember last window size" +msgstr "Husk forrige vindustørrelse" + +#: ../midori/midori-websettings.c:344 +msgid "Whether to save the last window size" +msgstr "Lagre forrige vindustørrelse eller ikke" + +#: ../midori/midori-websettings.c:352 +msgid "Last window width" +msgstr "Siste vinduesbredde" + +#: ../midori/midori-websettings.c:353 +msgid "The last saved window width" +msgstr "Siste lagrede vindusbredde" + +#: ../midori/midori-websettings.c:361 +msgid "Last window height" +msgstr "Siste vindushøyde" + +#: ../midori/midori-websettings.c:362 +msgid "The last saved window height" +msgstr "Siste lagrede vindushøyde" + +#: ../midori/midori-websettings.c:387 +msgid "Last panel position" +msgstr "Siste panelplassering" + +#: ../midori/midori-websettings.c:388 +msgid "The last saved panel position" +msgstr "Siste huskede panelplassering" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:397 +msgid "Last panel page" +msgstr "Siste panelside" + +#: ../midori/midori-websettings.c:398 +msgid "The last saved panel page" +msgstr "Siste lagrede panelside" + +#: ../midori/midori-websettings.c:406 +msgid "Last Web search" +msgstr "Siste nettsøk" + +#: ../midori/midori-websettings.c:407 +msgid "The last saved Web search" +msgstr "Ditt siste nettsøk" + +#: ../midori/midori-websettings.c:416 +msgid "Show Menubar" +msgstr "Vis menylinje" + +#: ../midori/midori-websettings.c:417 +msgid "Whether to show the menubar" +msgstr "Om menylinjen vises eller ikke" + +#: ../midori/midori-websettings.c:425 +msgid "Show Navigationbar" +msgstr "Vis navigasjonslinje" + +#: ../midori/midori-websettings.c:426 +msgid "Whether to show the navigationbar" +msgstr "Om navigasjonslinjen vises eller ikke" + +#: ../midori/midori-websettings.c:434 +msgid "Show Bookmarkbar" +msgstr "Vis bokmerkelinje" + +#: ../midori/midori-websettings.c:435 +msgid "Whether to show the bookmarkbar" +msgstr "Om bokmerkelinjen vises eller ikke" + +#: ../midori/midori-websettings.c:443 +msgid "Show Panel" +msgstr "Vis panel" + +#: ../midori/midori-websettings.c:444 +msgid "Whether to show the panel" +msgstr "Om panel vises eller ikke" + +#: ../midori/midori-websettings.c:459 +msgid "Show Transferbar" +msgstr "Vis overføringsstatus" + +#: ../midori/midori-websettings.c:460 +msgid "Whether to show the transferbar" +msgstr "Om overføringsstatus vises eller ikke" + +#: ../midori/midori-websettings.c:468 +msgid "Show Statusbar" +msgstr "Vis statuslinje" + +#: ../midori/midori-websettings.c:469 +msgid "Whether to show the statusbar" +msgstr "Om statuslinjen vises eller ikke" + +#: ../midori/midori-websettings.c:478 +msgid "Toolbar Style:" +msgstr "Verktøylinjestil:" + +#: ../midori/midori-websettings.c:479 +msgid "The style of the toolbar" +msgstr "Stil for verktøylinjen" + +#: ../midori/midori-websettings.c:495 +msgid "Show progress in location entry" +msgstr "Vis fremgang i adresselinjen" + +#: ../midori/midori-websettings.c:496 +msgid "Whether to show loading progress in the location entry" +msgstr "Vise sidelasting i adressefeltet" + +#: ../midori/midori-websettings.c:511 +msgid "Search engines in location completion" +msgstr "Søkemotorer i adressutfyllingen" + +#: ../midori/midori-websettings.c:512 +msgid "Whether to show search engines in the location completion" +msgstr "Om søkemotorer skal vises i adresseutfyllingen" + +#: ../midori/midori-websettings.c:520 +msgid "Toolbar Items" +msgstr "Verktøylinjeelementer" + +#: ../midori/midori-websettings.c:521 +msgid "The items to show on the toolbar" +msgstr "Elementer som vises på verktøylinjen" + +#: ../midori/midori-websettings.c:529 +msgid "Compact Sidepanel" +msgstr "Kompakt sidepanel" + +#: ../midori/midori-websettings.c:530 +msgid "Whether to make the sidepanel compact" +msgstr "Om sidepanelet skal være kompakt eller ikke" + +#: ../midori/midori-websettings.c:545 +msgid "Show operating controls of the panel" +msgstr "Vis handlingskontroller til panelet" + +#: ../midori/midori-websettings.c:546 +msgid "Whether to show the operating controls of the panel" +msgstr "Om handlingskontroller til panelet skal vises eller ikke" + +#: ../midori/midori-websettings.c:561 +msgid "Align sidepanel on the right" +msgstr "Flytt sidepanelet til høyre" + +#: ../midori/midori-websettings.c:562 +msgid "Whether to align the sidepanel on the right" +msgstr "Om sidepanelet skal vise på høyre side" + +#: ../midori/midori-websettings.c:571 +msgid "When Midori starts:" +msgstr "Når Midori starter:" + +#: ../midori/midori-websettings.c:572 +msgid "What to do when Midori starts" +msgstr "Hva som skal skje når Midori starter" + +#: ../midori/midori-websettings.c:581 +msgid "Homepage:" +msgstr "Hjemmeside:" + +#: ../midori/midori-websettings.c:582 +msgid "The homepage" +msgstr "Hjemmesiden" + +#: ../midori/midori-websettings.c:597 +msgid "Show crash dialog" +msgstr "Vis kræsjboks" + +#: ../midori/midori-websettings.c:598 +msgid "Show a dialog after Midori crashed" +msgstr "Vis en bok etter at Midori har kræsjet" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:614 +msgid "Show speed dial in new tabs" +msgstr "Vis speed dial i nye faner" + +#: ../midori/midori-websettings.c:615 +msgid "Show speed dial in newly opened tabs" +msgstr "Vis speed dial i nylig åpnede faner" + +#: ../midori/midori-websettings.c:623 +msgid "Save downloaded files to:" +msgstr "Lagre filer i:" + +#: ../midori/midori-websettings.c:624 +msgid "The folder downloaded files are saved to" +msgstr "Mappen hvor filene lagres" + +#: ../midori/midori-websettings.c:643 +msgid "Ask for the destination folder" +msgstr "Spør etter målmappe" + +#: ../midori/midori-websettings.c:644 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Om du skal spørres om målmappe ved nedlasting av filer" + +#: ../midori/midori-websettings.c:663 +msgid "Notify when a transfer has been completed" +msgstr "Beskjed når en overføring er ferdig" + +#: ../midori/midori-websettings.c:664 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Om du skal motta en beskjed når en overføring er ferdig" + +#: ../midori/midori-websettings.c:676 +msgid "Download Manager" +msgstr "Nedlastingsprogram" + +#: ../midori/midori-websettings.c:677 +msgid "An external download manager" +msgstr "Et eksternt nedlastingsprogram" + +#: ../midori/midori-websettings.c:685 +msgid "Text Editor" +msgstr "Tekstbehandler" + +#: ../midori/midori-websettings.c:686 +msgid "An external text editor" +msgstr "En ekstern tekstbehandler" + +#: ../midori/midori-websettings.c:701 +msgid "News Aggregator" +msgstr "Nyhetssamler" + +#: ../midori/midori-websettings.c:702 +msgid "An external news aggregator" +msgstr "En ekstern nyhetssamler" + +#: ../midori/midori-websettings.c:710 +msgid "Location entry Search" +msgstr "Søk for adressefeltet" + +#: ../midori/midori-websettings.c:711 +msgid "The search to perform inside the location entry" +msgstr "Søk som utføres i adressefeltet" + +#: ../midori/midori-websettings.c:719 +msgid "Preferred Encoding" +msgstr "Foretrukket tegnsett" + +#: ../midori/midori-websettings.c:720 +msgid "The preferred character encoding" +msgstr "Ditt foretrukne tegnsett" + +#: ../midori/midori-websettings.c:730 +msgid "Always Show Tabbar" +msgstr "Vis alltid fanelinje" + +#: ../midori/midori-websettings.c:731 +msgid "Always show the tabbar" +msgstr "Vis alltid fanelinjen" + +#: ../midori/midori-websettings.c:739 +msgid "Close Buttons on Tabs" +msgstr "Lukkeknapper på faner" + +#: ../midori/midori-websettings.c:740 +msgid "Whether tabs have close buttons" +msgstr "Om alle faner skal ha lukkeknapper" + +#: ../midori/midori-websettings.c:748 +msgid "Open new pages in:" +msgstr "Åpne nye sider i:" + +#: ../midori/midori-websettings.c:749 +msgid "Where to open new pages" +msgstr "Hvor nye sider skal åpnes" + +#: ../midori/midori-websettings.c:758 +msgid "Open external pages in:" +msgstr "Åpne eksterne sider i:" + +#: ../midori/midori-websettings.c:759 +msgid "Where to open externally opened pages" +msgstr "Hvor eksterne sider skal åpnes" + +#: ../midori/midori-websettings.c:768 +msgid "Middle click opens Selection" +msgstr "Midtklikk åpner valgt lenke" + +#: ../midori/midori-websettings.c:769 +msgid "Load an address from the selection via middle click" +msgstr "Last inn valgt adresse med den midterste museknappen" + +#: ../midori/midori-websettings.c:777 +msgid "Open tabs in the background" +msgstr "Åpne faner i bakgrunnen" + +#: ../midori/midori-websettings.c:778 +msgid "Whether to open new tabs in the background" +msgstr "Om nye faner skal åpnes i bakgrunnen" + +#: ../midori/midori-websettings.c:786 +msgid "Open Tabs next to Current" +msgstr "Åpne nye faner ved siden av den nåværende" + +#: ../midori/midori-websettings.c:787 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Om nye faner skal åpnes ved siden av den nåværende fanen" + +#: ../midori/midori-websettings.c:795 +msgid "Open popups in tabs" +msgstr "Åpne popups i faner" + +#: ../midori/midori-websettings.c:796 +msgid "Whether to open popup windows in tabs" +msgstr "Om popups skal åpnes i faner" + +#: ../midori/midori-websettings.c:812 +msgid "Zoom Text and Images" +msgstr "Zoom tekst og bilder" + +#: ../midori/midori-websettings.c:813 +msgid "Whether to zoom text and images" +msgstr "Om tekst og bilder skal zoomes" + +#: ../midori/midori-websettings.c:828 +msgid "Find inline while typing" +msgstr "Finn mens du skriver" + +#: ../midori/midori-websettings.c:829 +msgid "Whether to automatically find inline while typing" +msgstr "Om du vil søke på siden mens du skriver" + +#: ../midori/midori-websettings.c:837 +msgid "Accept cookies" +msgstr "Tillat cookies" + +#: ../midori/midori-websettings.c:838 +msgid "What type of cookies to accept" +msgstr "Hvilke typer cookies som skal tillates" + +#: ../midori/midori-websettings.c:847 +msgid "Original cookies only" +msgstr "Kun originale cookies" + +#: ../midori/midori-websettings.c:848 +msgid "Accept cookies from the original website only" +msgstr "Kun tillat originale cookies" + +#: ../midori/midori-websettings.c:856 +msgid "Maximum cookie age" +msgstr "Maksimal cookie-levetid" + +#: ../midori/midori-websettings.c:857 +msgid "The maximum number of days to save cookies for" +msgstr "Hvor lenge cookies får lov å leve" + +#: ../midori/midori-websettings.c:867 +msgid "Remember last visited pages" +msgstr "Husk sist besøkte sider" + +#: ../midori/midori-websettings.c:868 +msgid "Whether the last visited pages are saved" +msgstr "Om de siste sidene du har besøkt skal huskes" + +#: ../midori/midori-websettings.c:876 +msgid "Maximum history age" +msgstr "Maksimal alder for historikk" + +#: ../midori/midori-websettings.c:877 +msgid "The maximum number of days to save the history for" +msgstr "Det maksimale antall dager historikken vil lagres" + +#: ../midori/midori-websettings.c:885 +msgid "Remember last form inputs" +msgstr "Husk siste skjemautfyllinger" + +#: ../midori/midori-websettings.c:886 +msgid "Whether the last form inputs are saved" +msgstr "Om siste skjemautfyllinger skal huskes" + +#: ../midori/midori-websettings.c:894 +msgid "Remember last downloaded files" +msgstr "Husk siste nedlastede filer" + +#: ../midori/midori-websettings.c:895 +msgid "Whether the last downloaded files are saved" +msgstr "Om siste nedlastede filer skal huskes" + +#: ../midori/midori-websettings.c:905 +msgid "Proxy Server" +msgstr "Proxyserver" + +#: ../midori/midori-websettings.c:906 +msgid "The proxy server used for HTTP connections" +msgstr "Proxyserveren som brukes til HTTP-forbindelser" + +#: ../midori/midori-websettings.c:921 +msgid "Detect proxy server automatically" +msgstr "Gjenkjenn automatisk proxyserver" + +#: ../midori/midori-websettings.c:922 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Om proxyserveren skal finnes automatisk fra datamaskinen" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:938 +msgid "Identify as" +msgstr "Identifiser som" + +#: ../midori/midori-websettings.c:939 +msgid "What to identify as to web pages" +msgstr "Hva nettleseren identifiseres som" + +#: ../midori/midori-websettings.c:955 +msgid "Identification string" +msgstr "Identifikationsstreng" + +#: ../midori/midori-websettings.c:956 +msgid "The application identification string" +msgstr "Programmets identifikationsstreng" + +#: ../midori/midori-websettings.c:964 +msgid "Cache size" +msgstr "Størrelse av mellomlager" + +#: ../midori/midori-websettings.c:965 +msgid "The allowed size of the cache" +msgstr "Den tillatte størrelsen på mellomlageret" + +#: ../midori/midori-websettings.c:980 +msgid "Clear private data" +msgstr "Slett private data" + +#: ../midori/midori-websettings.c:981 +msgid "The private data selected for deletion" +msgstr "De private data valgt for sletting" + +#: ../midori/midori-view.c:781 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Siden '%s' kunne ikke lastes inn." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:783 +#: ../midori/midori-view.c:3013 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Feil" + +#: ../midori/midori-view.c:786 +msgid "Try again" +msgstr "Prøv igjen" + +#. i18n: The title of the 404 - Not found error page +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:818 +#: ../midori/midori-view.c:3017 +#, c-format +msgid "Not found - %s" +msgstr "Ikke funnet - %s" + +#: ../midori/midori-view.c:1205 +msgid "Open _Link" +msgstr "Åpne _lenke" + +#: ../midori/midori-view.c:1207 +msgid "Open Link in New _Tab" +msgstr "Åpne lenke i ny _fane" + +#: ../midori/midori-view.c:1224 +msgid "Open Link in New _Window" +msgstr "Åpne lenke i nytt _vindu" + +#: ../midori/midori-view.c:1230 +msgid "_Download Link destination" +msgstr "_Last ned lenkemål" + +#: ../midori/midori-view.c:1236 +msgid "_Save Link destination" +msgstr "_Lagre lenkemål" + +#: ../midori/midori-view.c:1245 +msgid "Download with Download _Manager" +msgstr "Hent med _nedlastingsprogram" + +#: ../midori/midori-view.c:1274 +msgid "Search _with" +msgstr "Søk _med" + +#: ../midori/midori-view.c:1306 +msgid "_Search the Web" +msgstr "_Søk på internett" + +#: ../midori/midori-view.c:1316 +msgid "Open Address in New _Tab" +msgstr "Åpne adresse i ny _fane" + +#: ../midori/midori-view.c:1494 +msgid "Open or download file" +msgstr "Åpne eller last ned fil" + +#: ../midori/midori-view.c:1511 +#, c-format +msgid "File Type: '%s'" +msgstr "Filtype: '%s'" + +#: ../midori/midori-view.c:1514 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Filtype: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1518 +#, c-format +msgid "Open %s" +msgstr "Åpne %s" + +#: ../midori/midori-view.c:1957 +#, c-format +msgid "Inspect page - %s" +msgstr "Undersøk side - %s" + +#: ../midori/midori-view.c:2147 +msgid "Speed dial" +msgstr "Snarveier (Speed dial)" + +#: ../midori/midori-view.c:2148 +msgid "Click to add a shortcut" +msgstr "Klikk for å legge til snarvei" + +#: ../midori/midori-view.c:2149 +msgid "Enter shortcut address" +msgstr "Skriv inn snarveiens adresse" + +#: ../midori/midori-view.c:2150 +msgid "Enter shortcut title" +msgstr "Skriv inn snarveiens tittel" + +#: ../midori/midori-view.c:2151 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Er du sikker på at du vil slette denne snarveien?" + +#: ../midori/midori-view.c:2181 +#, c-format +msgid "Document cannot be displayed" +msgstr "Dokumentet kan ikke vises" + +#: ../midori/midori-view.c:2198 +#, c-format +msgid "No documentation installed" +msgstr "Ingen dokumentasjon installert" + +#: ../midori/midori-view.c:2323 +msgid "Blank page" +msgstr "Tom side" + +#: ../midori/midori-view.c:2551 +#: ../midori/sokoke.c:865 +msgid "New _Tab" +msgstr "Ny _fane" + +#: ../midori/midori-view.c:2565 +msgid "_Duplicate Tab" +msgstr "_Kopier fane" + +#: ../midori/midori-view.c:2570 +msgid "_Restore Tab" +msgstr "_Gjenopprett fane" + +#: ../midori/midori-view.c:2570 +msgid "_Minimize Tab" +msgstr "_Minimer fane" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Innstillinger for %s" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "Generelt" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "Oppstart" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Bruk åpnet side som hjemmeside" + +#: ../midori/midori-preferences.c:425 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Nedlastinger" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "Utseende" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "Innstillinger for skrifttyper" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "Standard for skrifttypefamilie" + +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Standard skrifttype til visning av tekst" + +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "Størrelse av standardskriftstype brukes til å vise tekst" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Skrifttype med fast bredde" + +#: ../midori/midori-preferences.c:457 +msgid "The font family used to display fixed-width text" +msgstr "Skrifttypen som brukes for tekst med fast bredde" + +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Skriftstørrelsen som brukes til å vise tekst med fast bredde" + +#: ../midori/midori-preferences.c:463 +msgid "Minimum Font Size" +msgstr "Minimal skriftstørrelse" + +#: ../midori/midori-preferences.c:466 +msgid "The minimum font size used to display text" +msgstr "Minimum størrelse på tekst" + +#: ../midori/midori-preferences.c:473 +msgid "Encoding" +msgstr "Tegnkoding" + +#: ../midori/midori-preferences.c:476 +msgid "The character encoding to use by default" +msgstr "Foretrukket tegnsett" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:483 +msgid "Behavior" +msgstr "Oppførsel" + +#: ../midori/midori-preferences.c:484 +msgid "Features" +msgstr "Funksjonalitet" + +#: ../midori/midori-preferences.c:487 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Last bilder automatisk" + +#: ../midori/midori-preferences.c:488 +msgid "Load and display images automatically" +msgstr "Last inn og vis bilder automatisk" + +#: ../midori/midori-preferences.c:491 +msgid "Shrink images automatically" +msgstr "Forminsk bilder automatisk" + +#: ../midori/midori-preferences.c:492 +msgid "Automatically shrink standalone images to fit" +msgstr "Forminsk enkeltstående bilder for å passe inn" + +#: ../midori/midori-preferences.c:495 +msgid "Print background images" +msgstr "Skriv ut bakgrunnsbilder" + +#: ../midori/midori-preferences.c:496 +msgid "Whether background images should be printed" +msgstr "Om bakgrunnsbilder skal printes eller ikke" + +#: ../midori/midori-preferences.c:499 +msgid "Resizable text areas" +msgstr "Justerbare tekstområder" + +#: ../midori/midori-preferences.c:500 +msgid "Whether text areas are resizable" +msgstr "Om tekstområder skal kunne endre størrelse" + +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Slå på skripts" + +#: ../midori/midori-preferences.c:504 +msgid "Enable embedded scripting languages" +msgstr "Slå på bruk av skriptespråk" + +#: ../midori/midori-preferences.c:507 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Slå på Netscape-utvidelser" + +#: ../midori/midori-preferences.c:508 +msgid "Enable embedded Netscape plugin objects" +msgstr "Slå på objekter med Netscape-utvidelser" + +#: ../midori/midori-preferences.c:511 +msgid "Enforce 96 dots per inch" +msgstr "Tving bruk av 96 dpi" + +#: ../midori/midori-preferences.c:512 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Bruk alltid punkttetthet på 96 dpi" + +#: ../midori/midori-preferences.c:515 +msgid "Enable developer tools" +msgstr "Slå på utviklerverktøy" + +#: ../midori/midori-preferences.c:516 +msgid "Enable special extensions for developers" +msgstr "Slå på spesielle utvidelser for utviklere" + +#: ../midori/midori-preferences.c:523 +msgid "Spell Checking" +msgstr "Stavekontroll" + +#: ../midori/midori-preferences.c:526 +msgid "Enable Spell Checking" +msgstr "Slå på stavekontroll" + +#: ../midori/midori-preferences.c:527 +msgid "Enable spell checking while typing" +msgstr "Slå på stavekontroll mens du skriver" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:531 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "En kommadelt liste med språk som skal brukes for stavekontroll, for eksempel \"en_GB,de_DE\"" + +#. Page "Interface" +#: ../midori/midori-preferences.c:536 +msgid "Interface" +msgstr "Grensesnitt" + +#: ../midori/midori-preferences.c:537 +msgid "Navigationbar" +msgstr "Navigasjonslinje" + +#: ../midori/midori-preferences.c:548 +msgid "Browsing" +msgstr "Surfing" + +#. Page "Applications" +#: ../midori/midori-preferences.c:574 +msgid "Applications" +msgstr "Programmer" + +#: ../midori/midori-preferences.c:575 +msgid "External applications" +msgstr "Eksterne programmer" + +#. Page "Network" +#: ../midori/midori-preferences.c:621 +#: ../midori/midori-preferences.c:622 +msgid "Network" +msgstr "Nettverk" + +#: ../midori/midori-preferences.c:649 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:654 +msgid "Privacy" +msgstr "Beskyttelse av privatliv" + +#: ../midori/midori-preferences.c:655 +msgid "Web Cookies" +msgstr "Nett-cookies" + +#: ../midori/midori-preferences.c:668 +#: ../midori/midori-preferences.c:678 +msgid "days" +msgstr "dager" + +#: ../midori/midori-searchaction.c:488 +#: ../katze/katze-arrayaction.c:335 +msgid "Empty" +msgstr "Tom" + +#: ../midori/midori-searchaction.c:908 +msgid "Add search engine" +msgstr "Legg til søkemotor" + +#: ../midori/midori-searchaction.c:908 +msgid "Edit search engine" +msgstr "Rediger søkemotor" + +#: ../midori/midori-searchaction.c:936 +msgid "_Name:" +msgstr "_Navn:" + +#: ../midori/midori-searchaction.c:980 +msgid "_Icon:" +msgstr "_Ikon:" + +#: ../midori/midori-searchaction.c:994 +msgid "_Token:" +msgstr "_Symbol:" + +#: ../midori/midori-searchaction.c:1213 +msgid "Manage Search Engines" +msgstr "Håndter søkemotorer" + +#: ../midori/midori-searchaction.c:1312 +msgid "Use as _default" +msgstr "Bruk som _standard" + +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 +msgid "Could not run external program." +msgstr "Klarte ikke kjøre eksternt program" + +#: ../midori/sokoke.c:856 +msgid "_Bookmark" +msgstr "_Bokmerke" + +#: ../midori/sokoke.c:858 +msgid "Add Boo_kmark" +msgstr "Legg til bokmer_ke" + +#: ../midori/sokoke.c:859 +msgid "_Console" +msgstr "_Konsoll" + +#: ../midori/sokoke.c:860 +msgid "_Extensions" +msgstr "_Utvidelser" + +#: ../midori/sokoke.c:861 +msgid "_History" +msgstr "_Historikk" + +#: ../midori/sokoke.c:862 +msgid "_Homepage" +msgstr "_Hjemmeside" + +#: ../midori/sokoke.c:863 +msgid "_Userscripts" +msgstr "_Brukerskripts" + +#: ../midori/sokoke.c:864 +msgid "User_styles" +msgstr "Bruker_stiler" + +#: ../midori/sokoke.c:866 +msgid "_Transfers" +msgstr "_Nedlastinger" + +#: ../midori/sokoke.c:867 +msgid "Netscape p_lugins" +msgstr "Netscape-u_tvidelser" + +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "Brukerskripts" + +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "Brukerstiler" + +#: ../panels/midori-bookmarks.c:108 +msgid "Bookmarks" +msgstr "Bokmerker" + +#: ../panels/midori-bookmarks.c:239 +msgid "Edit the selected bookmark" +msgstr "Rediger valgt bokmerke" + +#: ../panels/midori-bookmarks.c:247 +msgid "Delete the selected bookmark" +msgstr "Slett det valgte bokmerket" + +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Ny mappe" + +#: ../panels/midori-bookmarks.c:592 +msgid "Separator" +msgstr "Separator" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsoll" + +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "Utvidelser" + +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Er du sikker på at du vil fjerne alle historieelementer?" + +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Bokmerk det valgte historieelementet" + +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Slett det valgte historieelementet" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Slett hele historikken" + +#: ../panels/midori-history.c:601 +msgid "A week ago" +msgstr "En uke siden" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dag siden" +msgstr[1] "%d dager siden" + +#: ../panels/midori-history.c:614 +msgid "Today" +msgstr "I dag" + +#: ../panels/midori-history.c:616 +msgid "Yesterday" +msgstr "I går" + +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape-utvidelser" + +#: ../panels/midori-transfers.c:271 +#, c-format +msgid "%s of %s" +msgstr "%s av %s" + +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Åpne mål_mappen" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Kopier _lenkemål" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Innlogging påkrevd" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Et brukernavn og passord er påkrevd\n" +"for å åpne denne siden:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Brukernavn" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Passord" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Angitt ikon '%s' kunne ikke lastes inn" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Lagerikon '%s' kunne ikke lastes inn" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Bilder i animasjonen er ødelagte" + +#: ../katze/katze-utils.c:200 +#: ../katze/katze-utils.c:407 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Egenskap '%s' er feil for %s" + +#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:264 +msgid "Choose file" +msgstr "Velg fil" + +#: ../katze/katze-utils.c:250 +msgid "Choose folder" +msgstr "Velg mappe" + +#: ../extensions/adblock.c:167 +msgid "Configure Advertisement filters" +msgstr "Konfiguer annonsefiltre" + +#: ../extensions/adblock.c:304 +msgid "Configure _Advertisement filters..." +msgstr "Konfiguer _annonsefiltre" + +#: ../extensions/adblock.c:562 +msgid "Advertisement blocker" +msgstr "Blokkering av reklame" + +#: ../extensions/adblock.c:563 +msgid "Block advertisements according to a filter list" +msgstr "Blokker reklame i henhold til en filterliste" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Farge faner tydelig" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Fargede faner" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Gi hver fane en egen farge" + +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookiehåndtering" + +#: ../extensions/cookie-manager/cookie-manager-page.c:111 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Slett alle cookies. Hvis et filter er valgt blir kun filtrerte cookies slettet." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Åpne alle" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "Lukk alle" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "Er du sikker på at du vil slette alle cookies?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Spørsmål" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "Kun cookies som ble filtrert ut vil bli slettet." + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 +msgid "At the end of the session" +msgstr "Ved avslutning av sesjonen" + +#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Vert: %s\n" +"Navn: %s\n" +"Verdi: %s\n" +"Sti: %s\n" +"Sikker: %s\n" +"Utløper: %s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "Yes" +msgstr "Ja" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "No" +msgstr "Nei" + +#: ../extensions/cookie-manager/cookie-manager-page.c:811 +msgid "Name" +msgstr "Navn" + +#: ../extensions/cookie-manager/cookie-manager-page.c:862 +msgid "_Expand All" +msgstr "_Åpne alle" + +#: ../extensions/cookie-manager/cookie-manager-page.c:870 +msgid "_Collapse All" +msgstr "_Lukk alle" + +#: ../extensions/cookie-manager/cookie-manager-page.c:923 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Skriv inn en filterstreng for å vise hvilke cookies som blir filtrert ut" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "_Cookiehåndtering" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "List, vis og slett cookies" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Klarte ikke å finne nødvendige Atom \"post\"-elementer i XML-data." + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Klarte ikke å finne nødvendige Atom \"feed\"-elementer i XML-data." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Sist oppdatert: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Nyhetsstrømmer" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Ny nyhetsstrøm" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Slett nyhetsstrøm" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Nyhetsstrømmer" + +#: ../extensions/feed-panel/feed-parse.c:185 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Klarte ikke å finne rot-element i nyhetsstrømmens XML-data." + +#: ../extensions/feed-panel/feed-parse.c:225 +#, c-format +msgid "Unsupported feed format." +msgstr "Ustøttet format for nyhetsstrøm." + +#: ../extensions/feed-panel/feed-parse.c:255 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Klarte ikke å tolke XML-strøm: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Klarte ikke å finne \"kanal\"-element i RSS-XML-data." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Ustøttet RSS-versjon funnet." + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Klarte ikke å finne nødvendige RSS \"punkt\"-elementer i XML-data." + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Klarte ikke å finne nødvendige RSS \"kanal\"-elementer i XML-data." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Nyhetsstrømmen '%s' finnes allerede" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Feil ved lastinv av nyhetsstrøm '%s'" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Ny nyhetsstrøm" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panel for nyhetsstrømmer" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Les Atom- og RSS-strømmer" + +#: ../extensions/mouse-gestures/main.c:236 +msgid "Mouse Gestures" +msgstr "Musebevegelser" + +#: ../extensions/mouse-gestures/main.c:237 +msgid "Control Midori by moving the mouse" +msgstr "Styr Midori ved å bevege musen" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Sideholder" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "_Sideholder" + +#: ../extensions/shortcuts.c:172 +msgid "Customize Keyboard shortcuts" +msgstr "Tilpass tastatursnarveier" + +#: ../extensions/shortcuts.c:264 +msgid "Customize Sh_ortcuts..." +msgstr "Tilpass tastat_ursnarveier" + +#: ../extensions/shortcuts.c:303 +msgid "Shortcuts" +msgstr "Snarveier" + +#: ../extensions/shortcuts.c:304 +msgid "View and edit keyboard shortcuts" +msgstr "Vis og rediger tastatursnarveier" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Bilder" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Skripts" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "Statuslinjefunksjoner" + +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "Enkelt slå av og på funksjonalitet for nettsider" + +#: ../extensions/tab-panel.c:383 +#: ../extensions/tab-panel.c:443 +msgid "Tab Panel" +msgstr "Fanepanel" + +#: ../extensions/tab-panel.c:427 +msgid "T_ab Panel" +msgstr "F_anepanel" + +#: ../extensions/tab-panel.c:444 +msgid "Show tabs in a vertical panel" +msgstr "Vis faner i et vertikalt panel" + +#: ../extensions/toolbar-editor.c:391 +msgid "Customize Toolbar" +msgstr "Tilpass verktøylinje" + +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Velg elementer som skal vises på verktøylinjen. Elementer kan flyttes ved å dra og slippe." + +#: ../extensions/toolbar-editor.c:423 +msgid "Available Items" +msgstr "Tilgjengelige elementer" + +#: ../extensions/toolbar-editor.c:444 +msgid "Displayed Items" +msgstr "Viste elementer" + +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "Tilpass _verktøylinje" + +#: ../extensions/toolbar-editor.c:611 +msgid "Toolbar Editor" +msgstr "Redigering av verktøylinje" + +#: ../extensions/toolbar-editor.c:612 +msgid "Easily edit the toolbar layout" +msgstr "Enkel redigering av verktøylinjens utseende" + +#~ msgid "_Quick Find" +#~ msgstr "_Find hurtigt" +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Hop hurtigt til et ord eller sætning" +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Om det valgte panel skal frigøres fra vinduet" +#~ msgid "Last open pages" +#~ msgstr "Sidste åbne sider" +#~ msgid "Both" +#~ msgstr "Begge" +#~ msgid "Both horizontal" +#~ msgstr "Begge vandrette" +#~ msgid "Load on Startup" +#~ msgstr "Indlæs ved opstart" +#~ msgid "Download Folder" +#~ msgstr "Nedhentning-mappen" +#~ msgid "Search" +#~ msgstr "Søg" +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Advarsel: Du bruger en superbruger-konto!" +#~ msgid "_Closed Tabs and Windows" +#~ msgstr "_Lukkede faneblade og vinduer" +#~ msgid "_Enable" +#~ msgstr "_Slå til" +#~ msgid "Enable" +#~ msgstr "Slå til" +#~ msgid "_Disable" +#~ msgstr "_Slå fra" +#~ msgid "Disable" +#~ msgstr "Slå fra" +#~ msgid "%d days ago" +#~ msgstr "For %d dage siden" +#~ msgid "P_lugins" +#~ msgstr "Udvidelses_moduler" +#~ msgid "Plugins" +#~ msgstr "Udvidelsesmoduler" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s har ingen egenskab '%s'" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s kan ikke blive tildelt til %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s kan ikke tilgås" +#~ msgid "Source" +#~ msgstr "Kilde" + diff --git a/po/pt.po b/po/pt.po index 9ec294d0..3601025c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.9\n" +"Project-Id-Version: Midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 00:44+0200\n" +"POT-Creation-Date: 2009-11-13 19:23+0100\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" @@ -18,14 +18,14 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Navegador Web leve" +msgstr "Navegador Web rápido" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1435 -#: ../midori/main.c:1609 -#: ../midori/main.c:1617 -#: ../midori/main.c:1628 -#: ../midori/midori-websettings.c:287 +#: ../midori/main.c:1492 +#: ../midori/main.c:1685 +#: ../midori/main.c:1693 +#: ../midori/main.c:1704 +#: ../midori/midori-websettings.c:289 msgid "Midori" msgstr "Midori" @@ -41,7 +41,7 @@ msgstr "A configuração não foi carregada: %s\n" #: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "O valor '%s' é inválido para %s" +msgstr "O valor '%s' é inválido para %s" #: ../midori/main.c:164 #: ../midori/main.c:245 @@ -50,11 +50,14 @@ msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " #: ../midori/main.c:369 +#: ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" #: ../midori/main.c:401 +#: ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" @@ -106,126 +109,128 @@ msgstr "Os marcadores não foram guardados. %s" msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:993 +#: ../midori/main.c:989 +#: ../midori/main.c:1161 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:1190 +#: ../midori/main.c:1199 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:1205 +#: ../midori/main.c:1214 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1209 +#: ../midori/main.c:1218 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:1214 +#: ../midori/main.c:1223 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1435 +#: ../midori/main.c:1392 +#: ../midori/main.c:1902 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A sessão não foi carregada: %s\n" + +#: ../midori/main.c:1492 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1458 +#: ../midori/main.c:1515 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1490 +#: ../midori/main.c:1547 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1609 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1539 +#: ../midori/main.c:1609 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1541 +#: ../midori/main.c:1612 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1541 +#: ../midori/main.c:1612 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1543 +#: ../midori/main.c:1615 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1546 +#: ../midori/main.c:1618 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1549 +#: ../midori/main.c:1621 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1551 +#: ../midori/main.c:1623 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1553 +#: ../midori/main.c:1625 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1606 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1629 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1631 +#: ../midori/main.c:1707 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1751 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1795 +#: ../midori/main.c:1869 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1813 +#: ../midori/main.c:1887 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1828 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "A sessão não foi carregada: %s\n" - -#: ../midori/main.c:1841 +#: ../midori/main.c:1915 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1854 +#: ../midori/main.c:1928 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1866 +#: ../midori/main.c:1940 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1882 +#: ../midori/main.c:1956 msgid "_Ignore" msgstr "_Ignorar " @@ -238,1164 +243,1235 @@ msgstr "Ficheiro não encontrado." msgid "Malformed document." msgstr "Documento mal formado." -#: ../midori/midori-array.c:432 -#: ../midori/sokoke.c:699 +#: ../midori/midori-array.c:437 +#: ../midori/sokoke.c:771 #, c-format msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:315 -#: ../midori/midori-browser.c:4327 -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4702 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:326 -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:4699 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:417 +#: ../midori/midori-browser.c:441 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:442 +#: ../midori/midori-browser.c:466 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:665 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:627 +#: ../midori/midori-browser.c:665 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:667 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:667 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:659 +#: ../midori/midori-browser.c:697 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:672 +#: ../midori/midori-browser.c:710 #: ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:729 #: ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:710 +#: ../midori/midori-browser.c:752 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:715 -#: ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:757 +#: ../midori/midori-browser.c:798 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:834 +#: ../midori/midori-browser.c:876 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1211 +#: ../midori/midori-browser.c:1248 #: ../panels/midori-transfers.c:272 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1284 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro '%s' foi transferido." -#: ../midori/midori-browser.c:1252 +#: ../midori/midori-browser.c:1288 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1393 +#: ../midori/midori-browser.c:1429 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2060 +#: ../midori/midori-browser.c:2136 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:2228 #: ../extensions/feed-panel/main.c:356 msgid "New feed" -msgstr "Novo feed" +msgstr "Nova fonte" + +#: ../midori/midori-browser.c:2251 +#: ../midori/midori-browser.c:4743 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3847 #: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../panels/midori-history.c:824 msgid "Open all in _Tabs" -msgstr "Abrir todas em _Separadores" +msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:3530 +#: ../midori/midori-browser.c:3854 #: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../panels/midori-history.c:830 +#: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3857 #: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../panels/midori-history.c:832 +#: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:3843 +#: ../midori/midori-browser.c:4164 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:4168 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:3860 +#: ../midori/midori-browser.c:4181 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:3870 -#: ../midori/midori-preferences.c:665 +#: ../midori/midori-browser.c:4191 +#: ../midori/midori-preferences.c:527 #: ../panels/midori-history.c:108 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:4196 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4201 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:3885 +#: ../midori/midori-browser.c:4206 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:3890 -#: ../midori/sokoke.c:873 +#: ../midori/midori-browser.c:4211 +#: ../midori/sokoke.c:944 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4219 msgid "Clear private data when _quitting Midori" -msgstr "Limpar dados privados ao sair de Midori" +msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4315 msgid "A lightweight web browser." -msgstr "Um navegador web leve." +msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:3995 +#: ../midori/midori-browser.c:4331 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:4261 +#: ../midori/midori-browser.c:4613 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:4263 -#: ../midori/sokoke.c:874 +#: ../midori/midori-browser.c:4615 +#: ../midori/sokoke.c:945 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4616 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:4267 +#: ../midori/midori-browser.c:4619 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4622 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:4273 +#: ../midori/midori-browser.c:4625 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4627 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4628 msgid "Add shortcut to speed dial" -msgstr "Adicionar atalho a ligação rápida" +msgstr "Adicionar atalho à ligação rápida" + +#: ../midori/midori-browser.c:4630 +msgid "Add Shortcut to the _desktop" +msgstr "A_dicionar Atalho ao ambiente de trabalho" + +#: ../midori/midori-browser.c:4631 +msgid "Add shortcut to the desktop" +msgstr "Adicionar atalho ao ambiente de trabalho" + +#: ../midori/midori-browser.c:4633 +msgid "Subscribe to News _feed" +msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4634 +msgid "Subscribe to this news feed" +msgstr "Subscrever a esta fonte de notícias" + +#: ../midori/midori-browser.c:4639 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4640 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4642 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4643 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4646 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4649 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4651 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4655 +msgid "Undo the last modification" +msgstr "Desfazer a última modificação" + +#: ../midori/midori-browser.c:4658 +msgid "Redo the last modification" +msgstr "Refazer a última modificação" + +#: ../midori/midori-browser.c:4662 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:4296 -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4668 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4671 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4674 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4677 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4680 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4682 msgid "Find _Next" -msgstr "_Localizar Próxima" +msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4683 msgid "Find the next occurrence of a word or phrase" -msgstr "Localizar próxima ocorrência da palavra ou frase" +msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4685 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4686 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4690 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4692 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4693 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4705 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:4708 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:4711 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:4343 +#: ../midori/midori-browser.c:4712 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:4345 +#: ../midori/midori-browser.c:4714 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4715 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:4348 +#: ../midori/midori-browser.c:4717 msgid "View Selection Source" -msgstr "Ver Origem da Selecção" +msgstr "Ver Fonte da Selecção" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:4718 msgid "View the source code of the selection" msgstr "Ver código fonte da selecção" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4722 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:4724 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4358 +#: ../midori/midori-browser.c:4727 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:4730 msgid "Go forward to the next page" msgstr "Ir para página seguinte" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4733 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:4735 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4736 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:4369 +#: ../midori/midori-browser.c:4738 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4739 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:4374 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Adicionar novo marcador" - -#: ../midori/midori-browser.c:4376 +#: ../midori/midori-browser.c:4745 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:4377 +#: ../midori/midori-browser.c:4746 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4748 #: ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4749 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:4383 +#: ../midori/midori-browser.c:4752 msgid "_Clear Private Data" -msgstr "_Limpar dados privados" +msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4753 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:4388 +#: ../midori/midori-browser.c:4757 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4758 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:4391 +#: ../midori/midori-browser.c:4760 msgid "_Next Tab" -msgstr "_Próximo Separador" +msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:4392 +#: ../midori/midori-browser.c:4761 msgid "Switch to the next tab" -msgstr "Mudar para próximo separador" +msgstr "Mudar para o separador seguinte" + +#: ../midori/midori-browser.c:4763 +msgid "Focus _Current Tab" +msgstr "Focar Separador _Actual" + +#: ../midori/midori-browser.c:4764 +msgid "Focus the current tab" +msgstr "Focar o separador actual" + +#: ../midori/midori-browser.c:4766 +msgid "Open last _session" +msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:4394 +#: ../midori/midori-browser.c:4767 +msgid "Open the tabs saved in the last session" +msgstr "Abrir separadores guardados na última sessão" + +#: ../midori/midori-browser.c:4769 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4771 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:4772 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:4399 +#: ../midori/midori-browser.c:4774 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4775 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:4402 +#: ../midori/midori-browser.c:4777 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:4403 +#: ../midori/midori-browser.c:4778 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:4781 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:4413 +#: ../midori/midori-browser.c:4788 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:4789 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:4419 +#: ../midori/midori-browser.c:4794 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4795 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:4423 +#: ../midori/midori-browser.c:4798 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:4424 +#: ../midori/midori-browser.c:4799 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:4427 +#: ../midori/midori-browser.c:4802 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:4428 +#: ../midori/midori-browser.c:4803 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:4431 +#: ../midori/midori-browser.c:4806 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:4432 +#: ../midori/midori-browser.c:4807 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4810 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:4436 +#: ../midori/midori-browser.c:4811 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:4439 +#: ../midori/midori-browser.c:4814 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4815 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:4447 +#: ../midori/midori-browser.c:4822 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:4450 -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4825 +#: ../midori/midori-websettings.c:215 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4454 +#: ../midori/midori-browser.c:4829 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:4457 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4832 +#: ../midori/midori-websettings.c:217 +msgid "Korean (EUC-KR)" +msgstr "Coreano (EUC-KR)" + +#: ../midori/midori-browser.c:4835 +#: ../midori/midori-websettings.c:218 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:4460 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:4838 +#: ../midori/midori-websettings.c:219 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4463 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:4841 +#: ../midori/midori-websettings.c:220 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:4466 -#: ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:4844 +#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:294 +#: ../katze/katze-utils.c:571 msgid "Custom..." -msgstr "Personalizar..." +msgstr "Personalizado..." -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:5331 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5338 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:5340 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5364 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5366 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5387 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5402 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5404 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:4995 -#: ../midori/sokoke.c:862 +#: ../midori/midori-browser.c:5419 +#: ../midori/sokoke.c:934 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5421 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5436 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5448 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5450 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5464 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5466 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5657 msgid "_Inline Find:" -msgstr "Localizar:" +msgstr "Local_izar:" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5688 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:5258 +#: ../midori/midori-browser.c:5693 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5698 msgid "Match Case" -msgstr "Maiúsculas e Minúsculas" +msgstr "Sensível à Capitalização" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5707 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:5281 +#: ../midori/midori-browser.c:5719 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5763 #: ../panels/midori-transfers.c:143 msgid "Clear All" msgstr "Limpar Tudo" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:6118 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" -#: ../midori/midori-locationaction.c:941 +#: ../midori/midori-locationaction.c:979 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:415 +#: ../midori/midori-panel.c:417 msgid "Detach chosen panel from the window" msgstr "Separar da janela o painel escolhido" -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:427 +#: ../midori/midori-panel.c:429 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Alinhar painel à direita" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:439 +#: ../midori/midori-panel.c:440 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Alinhar painel à esquerda" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:697 msgid "Show panel _titles" -msgstr "MOstrar _títulos de painel" +msgstr "Mostrar _títulos do painel" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:704 msgid "Show operating _controls" msgstr "Mostrar _controlos operacionais" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:793 msgid "Options" msgstr "Opções" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:198 msgid "Show Blank page" -msgstr "Mostrar página em branco" +msgstr "Mostrar Página em Branco" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:199 msgid "Show Homepage" msgstr "Mostrar Página Inicial" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:216 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:257 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:274 +#: ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:551 +#: ../extensions/shortcuts.c:94 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:292 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:346 msgid "Remember last window size" -msgstr "Lembrar último tamanho de janela" +msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:347 msgid "Whether to save the last window size" -msgstr "Marque se quiser guardar o último tamanho de janela" +msgstr "Marque se quiser guardar o último tamanho da janela" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:355 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:356 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:364 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:365 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:390 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:391 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:400 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:401 msgid "The last saved panel page" -msgstr "Última posição de painel de página guardada" +msgstr "Última página de painel guardada" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:409 msgid "Last Web search" msgstr "Última pesquisa Web" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:410 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:419 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:420 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:428 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:429 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:437 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:438 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:446 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:447 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:462 msgid "Show Transferbar" -msgstr "Mostrar barra de transferências" +msgstr "Mostrar Barra de Transferências" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the transferbar" msgstr "Marque se quiser mostrar a barra de transferências" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:471 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:481 msgid "Toolbar Style:" msgstr "Estilo da Barra de Ferramentas:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:482 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:498 msgid "Show progress in location entry" -msgstr "Mostrar evolução na entrada de localização" +msgstr "Mostrar evolução no endereço" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:499 msgid "Whether to show loading progress in the location entry" -msgstr "Marque se quiser mostrar a evolução do carregamento na entrada de localização" +msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:514 msgid "Search engines in location completion" -msgstr "Motores de pesquisa na conclusão da localização" +msgstr "Motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:515 msgid "Whether to show search engines in the location completion" -msgstr "Marque se quiser mostrar motores de pesquisa na conclusão da localização" +msgstr "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:523 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:524 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:532 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:533 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:548 msgid "Show operating controls of the panel" -msgstr "Mostrar os controlos operativos do painel" +msgstr "Mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:549 msgid "Whether to show the operating controls of the panel" -msgstr "Marque se quiser mostrar os controlos operativos do painel" +msgstr "Marque se quiser mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:564 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:565 msgid "Whether to align the sidepanel on the right" msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:574 msgid "When Midori starts:" msgstr "Ao iniciar Midori:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:575 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar Midori" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:584 msgid "Homepage:" msgstr "Página Inicial:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:585 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:600 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:601 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:617 msgid "Show speed dial in new tabs" -msgstr "Mostrar ligação rapida em novos separadores" +msgstr "Mostrar ligação rápida em novos separadores" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:618 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar ligação rápida em separadores recentemente abertos" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:626 msgid "Save downloaded files to:" msgstr "Guardar ficheiros transferidos em:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:627 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:648 msgid "Ask for the destination folder" msgstr "Perguntar pasta de destino" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:649 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Marcar se quiser perguntar por uma pasta de destino ao transferir um ficheiro" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:668 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:669 msgid "Whether to show a notification when a transfer has been completed" msgstr "Marque se quiser mostrar uma notificação ao concluir a transferência" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:681 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:682 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:690 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:691 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:706 msgid "News Aggregator" msgstr "Agregador de Notícias" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:707 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:719 msgid "Location entry Search" -msgstr "Pesquisa de entrada Local" +msgstr "Pesquisa de Endereço" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:720 msgid "The search to perform inside the location entry" -msgstr "A pesquisa a executar dentro da entrada local" +msgstr "A pesquisa a executar no endereço" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:728 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:729 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:739 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:740 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:748 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:749 msgid "Whether tabs have close buttons" -msgstr "Marque se quiser que os separadores tenham botões para fechar" +msgstr "Marque se quiser que os separadores tenham ícones para fechar" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:757 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:758 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:771 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:772 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:785 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:786 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:794 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:795 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:803 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:804 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:812 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:813 msgid "Whether to open popup windows in tabs" msgstr "Marque se quiser abrir janelas popup em separadores" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:823 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Carregar imagens automaticamente" + +#: ../midori/midori-websettings.c:824 +msgid "Load and display images automatically" +msgstr "Carregar e apresentar automaticamente as imagens " + +#: ../midori/midori-websettings.c:831 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Activar argumentos" + +#: ../midori/midori-websettings.c:832 +msgid "Enable embedded scripting languages" +msgstr "Activar argumentos de linguagem incorporados" + +#: ../midori/midori-websettings.c:839 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Activar plugins Netscape" + +#: ../midori/midori-websettings.c:840 +msgid "Enable embedded Netscape plugin objects" +msgstr "Activar plugins Netscape incorporados" + +#: ../midori/midori-websettings.c:855 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:856 msgid "Whether to zoom text and images" msgstr "Marque se quiser ajustar zoom de texto e imagens" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:871 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:872 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:887 +msgid "Kinetic scrolling" +msgstr "Deslocamento cinético" + +#: ../midori/midori-websettings.c:888 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Marque se quiser que o deslocamento se mova cineticamente conforme a velocidade" + +#: ../midori/midori-websettings.c:896 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:897 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:906 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:907 msgid "Accept cookies from the original website only" -msgstr "Aceitar cookies apenas do sítio web original" +msgstr "Apenas aceitar cookies do sítio web original" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:915 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:916 msgid "The maximum number of days to save cookies for" -msgstr "Número máximo de dias para guardar cookies" +msgstr "O número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:926 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:927 msgid "Whether the last visited pages are saved" msgstr "Marque se quiser guardar as últimas páginas visitadas" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:935 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:936 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Lembrar dados de formulários" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Marque se quiser guardar os dados de formulário" - -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:944 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:945 msgid "Whether the last downloaded files are saved" msgstr "Marque se quiser guardar as últimas transferências" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:955 msgid "Proxy Server" msgstr "Servidor Proxy" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:956 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:971 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:972 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Marque se quiser detectar automaticamente o servidor proxy do ambiente" +msgstr "Marque se quiser detectar automaticamente o servidor proxy" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:988 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:989 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1005 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1006 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Tamanho de cache" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Tamanho de cache permitido" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1021 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1022 msgid "The private data selected for deletion" msgstr "Os dados privados seleccionados para apagar" @@ -1403,341 +1479,342 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:782 -#: ../midori/midori-view.c:3043 -#: ../midori/midori-view.c:3047 +#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:3773 +#: ../midori/midori-view.c:3777 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:783 +#: ../midori/midori-view.c:912 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "A página '%s' não foi carregada." +msgstr "A página '%s' não foi carregada." -#: ../midori/midori-view.c:788 +#: ../midori/midori-view.c:917 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:821 +#: ../midori/midori-view.c:950 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:1218 +#: ../midori/midori-view.c:1164 +#: ../midori/midori-view.c:1878 +#, c-format +msgid "Send a message to %s" +msgstr "Enviar mensagem a %s" + +#: ../midori/midori-view.c:1717 +#: ../midori/midori-view.c:1780 msgid "Open _Link" msgstr "Abrir _Ligação" -#: ../midori/midori-view.c:1220 +#: ../midori/midori-view.c:1720 +#: ../midori/midori-view.c:1782 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1723 +#: ../midori/midori-view.c:1789 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:1243 -msgid "_Download Link destination" -msgstr "_Destino de Transferir Ligação" +#: ../midori/midori-view.c:1726 +msgid "_Copy Link destination" +msgstr "_Copiar destino da Ligação" -#: ../midori/midori-view.c:1249 +#: ../midori/midori-view.c:1729 +#: ../midori/midori-view.c:1801 msgid "_Save Link destination" -msgstr "De_stino para Guardar Ligação" +msgstr "_Guardar destino da Ligação" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1730 +#: ../midori/midori-view.c:1795 +msgid "_Download Link destination" +msgstr "_Transferir destino da Ligação" + +#: ../midori/midori-view.c:1734 +#: ../midori/midori-view.c:1770 +#: ../midori/midori-view.c:1806 msgid "Download with Download _Manager" msgstr "Transferir com _Gestor de Transferências" -#: ../midori/midori-view.c:1287 +#: ../midori/midori-view.c:1746 +msgid "Open _Image in New Tab" +msgstr "Abrir _Imagem em Novo Separador" + +#: ../midori/midori-view.c:1749 +msgid "Open Image in New Wi_ndow" +msgstr "Abrir Imagem em Nova Ja_nela" + +#: ../midori/midori-view.c:1752 +msgid "Copy Image _Address" +msgstr "Copiar _Endereço da Imagem" + +#: ../midori/midori-view.c:1755 +msgid "Save I_mage" +msgstr "Guardar I_magem" + +#: ../midori/midori-view.c:1756 +msgid "Download I_mage" +msgstr "Transferir I_magem" + +#: ../midori/midori-view.c:1763 +msgid "Copy Video _Address" +msgstr "Copiar _Endereço do Vídeo" + +#: ../midori/midori-view.c:1766 +msgid "Save _Video" +msgstr "Guardar _Vídeo" + +#: ../midori/midori-view.c:1766 +msgid "Download _Video" +msgstr "Transferir _Vídeo" + +#: ../midori/midori-view.c:1826 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:1319 +#: ../midori/midori-view.c:1854 +#: ../midori/midori-view.c:1865 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1886 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:2145 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:1524 +#: ../midori/midori-view.c:2162 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:2165 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1531 +#: ../midori/midori-view.c:2169 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:1981 +#: ../midori/midori-view.c:2685 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2896 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2897 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2898 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2899 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2900 msgid "Are you sure you want to delete this shortcut?" -msgstr "Tem a certeza que quer apagar este atalho ?" +msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2930 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2947 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:3072 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:2581 -#: ../midori/sokoke.c:870 -msgid "New _Tab" -msgstr "_Novo Separador" - -#: ../midori/midori-view.c:2595 +#: ../midori/midori-view.c:3315 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3320 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:2600 +#: ../midori/midori-view.c:3320 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:3149 +#: ../midori/midori-view.c:3879 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:3150 +#: ../midori/midori-view.c:3880 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:3194 -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-view.c:3924 +#: ../midori/midori-preferences.c:388 msgid "Features" -msgstr "Funções" - -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Preferências para %s" +msgstr "Funcionalidades" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:317 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:318 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:332 msgid "Use current page as homepage" msgstr "Usar página actual como página inicial" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:341 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferências" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:356 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:357 msgid "Font settings" -msgstr "Definição de fontes" +msgstr "Definições de fonte" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:359 msgid "Default Font Family" msgstr "Família de Fontes por Omissão" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:362 msgid "The default font family used to display text" msgstr "A família de fontes, usada por omissão, para apresentar texto" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:365 msgid "The default font size used to display text" msgstr "O tamanho da fonte, por omissão, para apresentar texto" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:367 msgid "Fixed-width Font Family" -msgstr "Familia de Fontes de Largura Fixa" +msgstr "Família de Fontes de Largura Fixa" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:370 msgid "The font family used to display fixed-width text" -msgstr "A família de fontes usada para apresentar texto com largura fixa" +msgstr "A família de fontes usada para apresentar texto com largura fixa" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:373 msgid "The font size used to display fixed-width text" msgstr "Tamanho da fonte para apresentar texto com largura fixa" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:375 msgid "Minimum Font Size" msgstr "Tamanho Mínimo de Fonte" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:378 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo de fonte para apresentar texto" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Codificação" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "A codificação de caracteres por omissão" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:387 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Carregar imagens automaticamente" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Carregar e apresentar automaticamente as imagens " - -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:400 msgid "Shrink images automatically" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:401 msgid "Automatically shrink standalone images to fit" msgstr "Encolher imagens automaticamente para caber" -#: ../midori/midori-preferences.c:499 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Activar argumentos" - -#: ../midori/midori-preferences.c:500 -msgid "Enable embedded scripting languages" -msgstr "Activar argumentos de idiomas incorporados" - -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Activar plugins Netscape" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded Netscape plugin objects" -msgstr "Activar plugins Netscape incorporados" - -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:413 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegada" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:414 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar densidade de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:417 msgid "Enable developer tools" msgstr "Activar ferramentas de desenvolvimento" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:418 msgid "Enable special extensions for developers" msgstr "Activar extensões especiais de desenvolvimento" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:428 msgid "Spell Checking" msgstr "Verificação Ortográfica" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:430 msgid "Enable Spell Checking" msgstr "Activar Verificação Ortográfica" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:431 msgid "Enable spell checking while typing" msgstr "Activar verificação ortográfica ao escrever" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:435 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Uma lista de idiomas, separados por vírgulas, para a verificação ortográficas, por exemplo \"en_GB,de_DE\"" +msgstr "Uma lista de idiomas, separados por vírgulas, para a verificação ortográfica, por exemplo \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:443 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:444 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:544 +#: ../midori/midori-preferences.c:454 msgid "Browsing" msgstr "Navegar" #. Page "Applications" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:476 msgid "Applications" msgstr "Aplicações" -#: ../midori/midori-preferences.c:569 +#: ../midori/midori-preferences.c:477 msgid "External applications" msgstr "Aplicações externas" #. Page "Network" -#: ../midori/midori-preferences.c:615 -#: ../midori/midori-preferences.c:616 +#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:494 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:643 -msgid "MB" -msgstr "MB" - #. Page "Privacy" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:662 -#: ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:532 msgid "days" msgstr "dias" @@ -1774,61 +1851,69 @@ msgstr "Gerir Motores de Pesquisa" msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:166 -#: ../midori/sokoke.c:178 +#: ../midori/sokoke.c:167 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:933 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:935 msgid "Add Boo_kmark" msgstr "Adicionar _Marcador" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:936 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:937 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:938 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:939 msgid "_Homepage" msgstr "_Página Inicial" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:940 msgid "_Userscripts" msgstr "Argumentos de _Utilizador" -#: ../midori/sokoke.c:869 -msgid "User_styles" -msgstr "E_stilos de Utilizador" +#: ../midori/sokoke.c:941 +msgid "New _Tab" +msgstr "_Novo Separador" -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:942 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:943 msgid "Netscape p_lugins" msgstr "P_lugins Netscape" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 +#: ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Argumentos de Utilizador" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Estilos de utilizador" +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "Copiar argumentos de utilizador para a pasta %s e copiar estilos de utilizador para a pasta %s." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Não é possível monitorizar a pasta '%s': %s " + #: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Marcadores" @@ -1873,22 +1958,30 @@ msgstr "Apagar item de histórico seleccionado" msgid "Clear the entire history" msgstr "Limpar todo o histórico" +#: ../panels/midori-history.c:600 +msgid "Erroneous clock time" +msgstr "Hora do relógio incorrecta" + #: ../panels/midori-history.c:601 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "O relógio está incorrecto. Por favor, verifique a data e hora actual." + +#: ../panels/midori-history.c:613 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:618 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dia atrás" msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:626 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:628 msgid "Yesterday" msgstr "Ontem" @@ -1905,11 +1998,11 @@ msgstr "Abrir Pas_ta de Destino" msgid "Copy Link Loc_ation" msgstr "Copiar Localização da Lig_ação" -#: ../katze/katze-http-auth.c:124 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" -msgstr "Autenticação Necessária " +msgstr "Requer Autenticação" -#: ../katze/katze-http-auth.c:140 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" @@ -1917,56 +2010,70 @@ msgstr "" "Precisa de um nome de utilizador e uma palavra-passe\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:154 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Nome de Utilizador" -#: ../katze/katze-http-auth.c:170 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Palavra-passe" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "_Lembrar palavra-passe" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "O ícone '%s' não foi carregado" +msgstr "O ícone '%s' não foi carregado" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "O ícone '%s' não foi carregado" +msgstr "O ícone '%s' não foi carregado" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:393 +#: ../katze/katze-utils.c:769 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Propriedade %s' é inválida para %s" +msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:439 +#: ../katze/katze-utils.c:468 msgid "Choose file" msgstr "Escolha ficheiro" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:454 msgid "Choose folder" msgstr "Escolha pasta" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:78 +#, c-format +msgid "Preferences for %s" +msgstr "Preferências para %s" + +#: ../extensions/adblock.c:345 msgid "Configure Advertisement filters" msgstr "Configurar filtros de Publicidade" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:375 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Digite o endereço de uma lista de filtros pré-configurados e clique em \"Adicionar\" para a adicionar à lista. Pode encontrar mais listas em %s." + +#: ../extensions/adblock.c:513 msgid "Configure _Advertisement filters..." msgstr "Configurar filtros de _Publicidade..." -#: ../extensions/adblock.c:565 +#: ../extensions/adblock.c:922 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:566 +#: ../extensions/adblock.c:923 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " @@ -1993,7 +2100,7 @@ msgstr "Apagar Todos" #: ../extensions/cookie-manager/cookie-manager-page.c:111 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Apagar todos os cookies mostrados. Se definir um filtro, só serão eliminados os cookies que coincidirem com o filtro." +msgstr "Apagar todos os cookies mostrados. Se definir um filtro, só serão eliminados os cookies que coincidam com o filtro." #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" @@ -2001,7 +2108,7 @@ msgstr "Expandir Todos" #: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" -msgstr "_Unir Todos" +msgstr "Contrair Todos" #: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" @@ -2029,7 +2136,7 @@ msgid "" "Secure: %s\n" "Expires: %s" msgstr "" -"Hospedeiro: %s\n" +"Anfitrião: %s\n" "Nome: %s\n" "Valor: %s\n" "Caminho: %s\n" @@ -2054,7 +2161,7 @@ msgstr "_Expandir Todos" #: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" -msgstr "_Unir Todos" +msgstr "_Contrair Todos" #: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" @@ -2072,13 +2179,21 @@ msgstr "Gestor de _Cookies" msgid "List, view and delete cookies" msgstr "Listar, ver e apagar cookies" +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Obtenção prévia de DNS" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Obter previamente os endereços IP das ligações " + #: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Falha ao encontrar os elementos de \"entrada\" Atom nos dados XML." +msgstr "Falha ao encontrar os elementos Atom de \"entry\" nos dados XML." #: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Falha ao encontrar os elementos de \"feed\" Atom nos dados XML." +msgstr "Falha ao encontrar os elementos Atom de \"feed\" nos dados XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2087,40 +2202,40 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualização : %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" -msgstr "Feeds" +msgstr "Fontes" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" -msgstr "Adicionar novo feed" +msgstr "Adicionar nova fonte" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" -msgstr "Apagar feed" +msgstr "Apagar fonte" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" -msgstr "_Feeds" +msgstr "_Fontes" #: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Falha ao encontrar os elementos root nos dados feed XML." +msgstr "Falha ao encontrar o elemento root nos dados XML da fonte." #: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." -msgstr "Formato de feed não suportado" +msgstr "Formato de fonte não suportado." #: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Falha ao analisar o XML do feed: %s" +msgstr "Falha ao analisar o XML da fonte: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Falha ao encontrar os elementos de \"canal\" nos dados RSS XML." +msgstr "Falha ao encontrar o elemento \"channel\" nos dados RSS XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2128,11 +2243,11 @@ msgstr "Encontrada uma versão RSS não suportada." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Falha ao encontrar os elementos de RSS \"item\" nos dados XML." +msgstr "Falha ao encontrar os elementos RSS do \"item\" nos dados XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Falha ao encontrar os elementos de RSS \"canal\" nos dados XML." +msgstr "Falha ao encontrar os elementos RSS do \"channel\" nos dados XML." #: ../extensions/feed-panel/main.c:124 msgid "Error" @@ -2141,26 +2256,48 @@ msgstr "Erro" #: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" -msgstr "A feed '%s'' já existe" +msgstr "Já existe a fonte '%s'" #: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" -msgstr "Erro ao carregar o feed '%s'" +msgstr "Erro ao carregar a fonte '%s'" #: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" -msgstr "Painel de Feeds" +msgstr "Painel de Fontes" #: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" -msgstr "Ler feeds Atom/ RSS" +msgstr "Ler fontes Atom/RSS" + +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "Armazena o histórico do formulário" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "Não disponível: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "O ficheiro de recursos não está instalado" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "Preenchimento do formulário" + +#: ../extensions/mouse-gestures/main.c:246 msgid "Mouse Gestures" msgstr "Gestos de Rato" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures/main.c:247 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori movendo o rato" @@ -2168,25 +2305,29 @@ msgstr "Controlar Midori movendo o rato" #: ../extensions/page-holder.c:129 #: ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "Titular de Página" +msgstr "Fixador de Página" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "Titular de _Página" +msgstr "Fixador de _Página" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Manter uma ou várias páginas abertas em paralelo aos separadores" -#: ../extensions/shortcuts.c:172 +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" -msgstr "Personalizar atalhos de teclado" +msgstr "Personalizar atalhos de Teclado" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "Personalizar Atalh_os..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" @@ -2200,32 +2341,40 @@ msgstr "Argumentos" #: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" -msgstr "Funçoes da barra de estado" +msgstr "Funções na Barra de Estado" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "Alternar facilmente as funções ligado e desligado nas páginas web" +msgstr "Ligar/desligar facilmente as funções em páginas web" -#: ../extensions/tab-panel.c:558 -#: ../extensions/tab-panel.c:613 +#: ../extensions/tab-panel.c:562 +#: ../extensions/tab-panel.c:619 msgid "Tab Panel" msgstr "Painel de Separadores" -#: ../extensions/tab-panel.c:597 +#: ../extensions/tab-panel.c:603 msgid "T_ab Panel" msgstr "P_ainel de Separadores" -#: ../extensions/tab-panel.c:614 +#: ../extensions/tab-panel.c:620 msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores em painel vertical" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "Lista de Histórico do Separador" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permite mudar de separadores ao escolher de uma lista ordenada por uso" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Personalizar Barra de Ferramentas" #: ../extensions/toolbar-editor.c:407 msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Selecione os itens a mostar na barra de ferramentas. Os itens podem ser ordenados por arrastamento." +msgstr "Seleccione os itens a mostar na barra de ferramentas. Os itens podem ser ordenados por arrastamento." #: ../extensions/toolbar-editor.c:423 msgid "Available Items" @@ -2239,14 +2388,42 @@ msgstr "Itens Apresentados" msgid "Customize _Toolbar..." msgstr "Personalizar Barra de _Ferramentas..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "Editor da Barra de Ferramentas" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" -msgstr "Editor fácil da barra de ferramentas" - +msgstr "Editar facilmente a barra de ferramentas" + +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "Não disponível para esta plataforma" + +#: ../extensions/web-cache.c:583 +msgid "Web Cache" +msgstr "Cache Web" + +#: ../extensions/web-cache.c:584 +msgid "Cache HTTP communication on disk" +msgstr "Por em cache as comunicações HTTP" + +#~ msgid "Remember last form inputs" +#~ msgstr "Lembrar dados de formulários" +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Marque se quiser guardar os dados de formulário" +#~ msgid "Cache size" +#~ msgstr "Tamanho de cache" +#~ msgid "The allowed size of the cache" +#~ msgstr "Tamanho de cache permitido" +#~ msgid "Encoding" +#~ msgstr "Codificação" +#~ msgid "The character encoding to use by default" +#~ msgstr "A codificação de caracteres por omissão" +#~ msgid "MB" +#~ msgstr "MB" +#~ msgid "User_styles" +#~ msgstr "E_stilos de Utilizador" #~ msgid "Resizable text areas" #~ msgstr "Áreas de texto dimensionáveis" #~ msgid "Whether text areas are resizable" @@ -2261,8 +2438,6 @@ msgstr "Editor fácil da barra de ferramentas" #~ msgstr "Ambos na horizontal" #~ msgid "Load on Startup" #~ msgstr "Carregar ao Iniciar" -#~ msgid "Download Folder" -#~ msgstr "Pasta de Transferências" #~ msgid "Configure _Toolbar..." #~ msgstr "Configurar Barra de Ferramentas" #~ msgid "_Quick Find" diff --git a/po/ru.po b/po/ru.po index a104810a..a2e2882f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.9\n" +"Project-Id-Version: midori 0.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-08 03:11+0900\n" -"PO-Revision-Date: 2009-08-08 04:02+0800\n" +"POT-Creation-Date: 2009-12-03 22:46+0800\n" +"PO-Revision-Date: 2009-12-03 23:04+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1343 -#: ../midori/main.c:1517 -#: ../midori/main.c:1525 -#: ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +#: ../midori/main.c:1489 +#: ../midori/main.c:1685 +#: ../midori/main.c:1693 +#: ../midori/main.c:1704 +#: ../midori/midori-websettings.c:292 msgid "Midori" msgstr "Midori" @@ -34,1817 +34,1975 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:96 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:169 +#: ../midori/main.c:250 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:350 +#: ../midori/main.c:374 +#: ../extensions/formhistory.c:438 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:382 +#: ../midori/main.c:406 +#: ../extensions/formhistory.c:453 +#: ../extensions/formhistory.c:457 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:460 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:484 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:507 +#: ../midori/main.c:541 +#: ../midori/main.c:557 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:736 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:765 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:803 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:798 -#: ../midori/main.c:826 -#: ../midori/main.c:855 +#: ../midori/main.c:822 +#: ../midori/main.c:850 +#: ../midori/main.c:879 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 -#: ../midori/main.c:901 +#: ../midori/main.c:902 +#: ../midori/main.c:925 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:994 +#: ../midori/main.c:1166 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1101 +#: ../midori/main.c:1204 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1116 +#: ../midori/main.c:1219 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1120 +#: ../midori/main.c:1223 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1125 +#: ../midori/main.c:1228 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1343 +#: ../midori/main.c:1393 +#: ../midori/main.c:1906 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Не удалось загрузить сеанс: %s\n" + +#: ../midori/main.c:1489 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1366 +#: ../midori/main.c:1512 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1398 +#: ../midori/main.c:1544 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1601 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1447 +#: ../midori/main.c:1601 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1449 +#: ../midori/main.c:1604 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1449 +#: ../midori/main.c:1604 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1451 +#: ../midori/main.c:1607 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1610 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1457 +#: ../midori/main.c:1613 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1459 +#: ../midori/main.c:1615 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1461 +#: ../midori/main.c:1617 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1514 +#: ../midori/main.c:1682 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1705 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1539 +#: ../midori/main.c:1707 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1619 +#: ../midori/main.c:1777 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1655 +#: ../midori/main.c:1825 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1873 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1891 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1742 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Не удалось загрузить сеанс: %s\n" - -#: ../midori/main.c:1755 +#: ../midori/main.c:1919 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:1932 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:1944 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1960 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:376 msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:258 -#: ../midori/midori-array.c:267 +#: ../midori/midori-array.c:410 +#: ../midori/midori-array.c:433 +#: ../midori/midori-array.c:443 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/midori-array.c:429 -#: ../midori/sokoke.c:694 +#: ../midori/midori-array.c:452 +msgid "Unrecognized bookmark format." +msgstr "Неизвестный формат закладок." + +#: ../midori/midori-array.c:635 +#: ../midori/sokoke.c:955 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4260 -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:330 +#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4948 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:340 +#: ../midori/midori-browser.c:4945 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:478 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:679 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:679 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:681 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:681 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:711 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:661 -#: ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:724 +#: ../midori/midori-searchaction.c:967 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:680 -#: ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:743 +#: ../midori/midori-searchaction.c:981 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:773 +#: ../midori/midori-browser.c:4200 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:704 -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:783 +#: ../midori/midori-browser.c:859 +#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4237 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:812 +msgid "Show in the tool_bar" +msgstr "По_казывать на панели закладок" + +#: ../midori/midori-browser.c:827 +msgid "Run as _web application" +msgstr "Запускать как _веб-приложение" + +#: ../midori/midori-browser.c:935 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1203 +#: ../midori/midori-browser.c:1302 +#: ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "%s из %s" + +#: ../midori/midori-browser.c:1338 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл «%s» загружен." -#: ../midori/midori-browser.c:1207 +#: ../midori/midori-browser.c:1342 msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../midori/midori-browser.c:1348 +#: ../midori/midori-browser.c:1482 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2015 +#: ../midori/midori-browser.c:2181 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3461 -#: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2257 +#: ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Новая лента" + +#: ../midori/midori-browser.c:2290 +#: ../midori/midori-browser.c:4989 +#: ../panels/midori-bookmarks.c:243 +msgid "Add a new bookmark" +msgstr "Новая закладка" + +#: ../midori/midori-browser.c:3448 +#: ../midori/sokoke.c:275 +#: ../midori/sokoke.c:285 +#: ../midori/sokoke.c:313 +#: ../midori/sokoke.c:335 +#: ../midori/sokoke.c:349 +msgid "Could not run external program." +msgstr "Не удалось выполнить внешнюю программу." + +#: ../midori/midori-browser.c:3943 +#: ../panels/midori-bookmarks.c:796 +#: ../panels/midori-history.c:822 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3468 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3950 +#: ../panels/midori-bookmarks.c:802 +#: ../panels/midori-history.c:828 +#: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3471 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3953 +#: ../panels/midori-bookmarks.c:804 +#: ../panels/midori-history.c:830 +#: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:4132 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4133 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4134 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4154 +#: ../panels/midori-bookmarks.c:272 +msgid "Import bookmarks..." +msgstr "Импорт закладок..." + +#: ../midori/midori-browser.c:4157 +#: ../midori/midori-browser.c:4994 +msgid "_Import bookmarks" +msgstr "_Импортировать закладки" + +#: ../midori/midori-browser.c:4168 +msgid "_Application:" +msgstr "_Приложение:" + +#: ../midori/midori-browser.c:4256 +msgid "Failed to import bookmarks" +msgstr "Не удалось импортировать закладки" + +#: ../midori/midori-browser.c:4405 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:4409 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:3798 +#: ../midori/midori-browser.c:4422 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:3808 -#: ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:4432 +#: ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:108 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4437 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:3818 +#: ../midori/midori-browser.c:4442 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:3823 +#: ../midori/midori-browser.c:4447 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:3828 -#: ../midori/sokoke.c:868 +#: ../midori/midori-browser.c:4452 +#: ../midori/sokoke.c:1114 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:3836 +#: ../midori/midori-browser.c:4457 +#: ../extensions/web-cache.c:591 +msgid "Web Cache" +msgstr "Сетевой кэш" + +#: ../midori/midori-browser.c:4465 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4561 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4577 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:4194 +#: ../midori/midori-browser.c:4859 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4196 -#: ../midori/sokoke.c:869 +#: ../midori/midori-browser.c:4861 +#: ../midori/sokoke.c:1115 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:4197 +#: ../midori/midori-browser.c:4862 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4200 +#: ../midori/midori-browser.c:4865 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4203 +#: ../midori/midori-browser.c:4868 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4206 +#: ../midori/midori-browser.c:4871 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4208 +#: ../midori/midori-browser.c:4873 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4209 +#: ../midori/midori-browser.c:4874 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4876 +msgid "Add Shortcut to the _desktop" +msgstr "Добавить кнопку запуска на _рабочий стол" + +#: ../midori/midori-browser.c:4877 +msgid "Add shortcut to the desktop" +msgstr "Добавить кнопку запуска на рабочий стол" + +#: ../midori/midori-browser.c:4879 +msgid "Subscribe to News _feed" +msgstr "Подписаться на _ленту новостей" + +#: ../midori/midori-browser.c:4880 +msgid "Subscribe to this news feed" +msgstr "Подписаться на эту ленту новостей" + +#: ../midori/midori-browser.c:4885 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4212 +#: ../midori/midori-browser.c:4886 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4888 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4889 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4892 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4221 +#: ../midori/midori-browser.c:4895 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4897 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4901 +msgid "Undo the last modification" +msgstr "Отменить последнее изменение" + +#: ../midori/midori-browser.c:4904 +msgid "Redo the last modification" +msgstr "Повторить последнее изменение" + +#: ../midori/midori-browser.c:4908 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4914 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4917 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4920 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:4923 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4926 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4246 +#: ../midori/midori-browser.c:4928 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4929 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4249 +#: ../midori/midori-browser.c:4931 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4932 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4254 +#: ../midori/midori-browser.c:4936 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4256 +#: ../midori/midori-browser.c:4938 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4939 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4269 +#: ../midori/midori-browser.c:4951 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4954 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4957 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4958 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4960 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4961 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4963 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4964 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4968 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4970 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4973 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4976 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4979 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4981 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:4300 +#: ../midori/midori-browser.c:4982 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4984 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4985 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:4307 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Новая закладка" - -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4991 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4992 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:4312 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4997 +#: ../midori/midori-searchaction.c:500 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4998 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:5001 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:5002 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:5006 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:5007 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:5009 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:5010 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:5012 +msgid "Focus _Current Tab" +msgstr "_Фокус на текущую вкладку" + +#: ../midori/midori-browser.c:5013 +msgid "Focus the current tab" +msgstr "Перевести фокус ввода на текущую вкладку" + +#: ../midori/midori-browser.c:5015 +msgid "Open last _session" +msgstr "Открыть предыдущий _сеанс" + +#: ../midori/midori-browser.c:5016 +msgid "Open the tabs saved in the last session" +msgstr "Открыть вкладки из предыдущего сеанса" + +#: ../midori/midori-browser.c:5018 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:5020 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:5021 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:5023 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:5024 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:4335 +#: ../midori/midori-browser.c:5026 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:5027 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:5030 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:5037 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4347 +#: ../midori/midori-browser.c:5038 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:5043 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:5044 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:5047 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:4357 +#: ../midori/midori-browser.c:5048 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:4360 +#: ../midori/midori-browser.c:5051 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:5052 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:5055 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:5056 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:4368 +#: ../midori/midori-browser.c:5059 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:4369 +#: ../midori/midori-browser.c:5060 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:5063 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:4373 +#: ../midori/midori-browser.c:5064 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:5071 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:4383 -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:5074 +#: ../midori/midori-websettings.c:217 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4387 +#: ../midori/midori-browser.c:5078 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:4390 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5081 +#: ../midori/midori-websettings.c:219 +msgid "Korean (EUC-KR)" +msgstr "Корейская (EUC-KR)" + +#: ../midori/midori-browser.c:5084 +#: ../midori/midori-websettings.c:220 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:4393 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5087 +#: ../midori/midori-websettings.c:221 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:4396 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5090 +#: ../midori/midori-websettings.c:222 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:4399 -#: ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:5093 +#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:297 +#: ../katze/katze-utils.c:672 msgid "Custom..." -msgstr "Другая..." +msgstr "Выбрать..." -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:5643 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5650 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:4846 +#: ../midori/midori-browser.c:5652 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:5676 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:5678 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:5699 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:5714 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:5716 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:4925 -#: ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:5731 +#: ../midori/sokoke.c:1104 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:5733 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5748 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5761 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5763 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5777 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:5779 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5982 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:5183 +#: ../midori/midori-browser.c:6013 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:6018 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:6023 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:6032 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:6044 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:5246 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Удалить всё" +#: ../midori/midori-browser.c:6090 +#: ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "Очистить все" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:6457 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:974 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:436 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:448 +#: ../midori/midori-panel.c:638 +#: ../midori/midori-panel.c:641 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:459 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:639 +#: ../midori/midori-panel.c:642 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:704 +#: ../midori/midori-panel.c:722 msgid "Show panel _titles" msgstr "_Заголовки панелей" -#: ../midori/midori-panel.c:712 +#: ../midori/midori-panel.c:729 msgid "Show operating _controls" msgstr "_Элементы управления" -#: ../midori/midori-panel.c:783 +#: ../midori/midori-panel.c:834 msgid "Options" msgstr "Настройки" -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Открыть пустую страницу" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:218 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 +msgid "Small icons" +msgstr "Маленькие значки" + +#: ../midori/midori-websettings.c:258 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:259 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:260 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:275 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:276 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:277 +#: ../panels/midori-addons.c:93 +#: ../katze/katze-utils.c:648 +#: ../extensions/shortcuts.c:94 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:294 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:295 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:296 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:349 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:350 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:358 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:359 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:367 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:368 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:393 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:394 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:403 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:404 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:412 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:413 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:422 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:431 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:440 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:449 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:465 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:466 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:474 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:475 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:484 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:485 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:501 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:502 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:517 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:518 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:526 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:527 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:535 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:536 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:551 msgid "Show operating controls of the panel" msgstr "Показать элементы управления панелью" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:552 msgid "Whether to show the operating controls of the panel" msgstr "Показывать элементы управления панелью" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:567 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:568 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:583 +msgid "Open panels in separate windows" +msgstr "Открывать панели в отдельных окнах" + +#: ../midori/midori-websettings.c:584 +msgid "Whether to always open panels in separate windows" +msgstr "Панели при открытии будут отделены от главного окна" + +#: ../midori/midori-websettings.c:593 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:594 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:603 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:604 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:619 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:620 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:636 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:637 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:645 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:646 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:667 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:668 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:687 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:688 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:700 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:701 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:709 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:710 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:725 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:726 msgid "An external news aggregator" -msgstr "Программа чтения лент новостей" +msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:734 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:735 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:743 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:744 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:754 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:755 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:763 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:764 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:772 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:773 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:782 msgid "Open external pages in:" msgstr "Открывать внешние страницы в:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:783 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:792 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:793 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:801 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:802 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:810 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:811 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:819 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:820 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:830 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Загружать изображения автоматически" + +#: ../midori/midori-websettings.c:831 +msgid "Load and display images automatically" +msgstr "Загружать и отображать изображения автоматически" + +#: ../midori/midori-websettings.c:838 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Выполнять сценарии" + +#: ../midori/midori-websettings.c:839 +msgid "Enable embedded scripting languages" +msgstr "Выполнять встроенные сценарии на страницах" + +#: ../midori/midori-websettings.c:846 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Использовать модули Netscape" + +#: ../midori/midori-websettings.c:847 +msgid "Enable embedded Netscape plugin objects" +msgstr "Разрешить встроенные объекты модулей Netscape на страницах" + +#: ../midori/midori-websettings.c:862 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:863 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:878 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:879 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:894 +msgid "Kinetic scrolling" +msgstr "Инерционная прокрутка" + +#: ../midori/midori-websettings.c:895 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" + +#: ../midori/midori-websettings.c:903 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:904 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:913 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:914 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:922 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:923 msgid "The maximum number of days to save cookies for" -msgstr "Максимальное число дней хранения фрагментов данных" +msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:940 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:941 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:949 msgid "Maximum history age" -msgstr "Максимальный возраст записей" +msgstr "Хранить историю за последние" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:950 msgid "The maximum number of days to save the history for" -msgstr "Максимальное число дней хранения записей в журнале" +msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Запоминать введённые в формы данные" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Сохранять последние введённые данные в формы ввода" - -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:958 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:959 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:969 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:970 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:985 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:986 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:1002 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:1003 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1019 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1020 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Размер кэша" - -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Разрешённый размер кэша" - -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1035 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1036 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" -#: ../midori/midori-view.c:781 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:915 +#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3824 +#, c-format +msgid "Error - %s" +msgstr "Ошибка — %s" + +#: ../midori/midori-view.c:916 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, -#. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:783 -#: ../midori/midori-view.c:3019 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Ошибка" - -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:921 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 -#: ../midori/midori-view.c:3023 +#: ../midori/midori-view.c:954 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1168 +#: ../midori/midori-view.c:1904 +#, c-format +msgid "Send a message to %s" +msgstr "Отправить сообщение %s" + +#: ../midori/midori-view.c:1731 +#: ../midori/midori-view.c:1799 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1734 +#: ../midori/midori-view.c:1801 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1738 +msgid "Open Link in _Foreground Tab" +msgstr "Открыть ссылку в новой _активной вкладке" + +#: ../midori/midori-view.c:1739 +msgid "Open Link in _Background Tab" +msgstr "Открыть ссылку в _фоновой вкладке" + +#: ../midori/midori-view.c:1742 +#: ../midori/midori-view.c:1808 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:1235 -msgid "_Download Link destination" -msgstr "_Загрузить объект" +#: ../midori/midori-view.c:1745 +msgid "_Copy Link destination" +msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:1241 +#: ../midori/midori-view.c:1748 +#: ../midori/midori-view.c:1820 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:1250 +#: ../midori/midori-view.c:1749 +#: ../midori/midori-view.c:1814 +msgid "_Download Link destination" +msgstr "_Загрузить объект" + +#: ../midori/midori-view.c:1753 +#: ../midori/midori-view.c:1789 +#: ../midori/midori-view.c:1825 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1765 +msgid "Open _Image in New Tab" +msgstr "Открыть изображение в новой _вкладке" + +#: ../midori/midori-view.c:1768 +msgid "Open Image in New Wi_ndow" +msgstr "Открыть изображение в новом _окне" + +#: ../midori/midori-view.c:1771 +msgid "Copy Image _Address" +msgstr "Копировать _адрес изображения" + +#: ../midori/midori-view.c:1774 +msgid "Save I_mage" +msgstr "Сохранить _изображение" + +#: ../midori/midori-view.c:1775 +msgid "Download I_mage" +msgstr "Загрузить _изображение" + +#: ../midori/midori-view.c:1782 +msgid "Copy Video _Address" +msgstr "Копировать _адрес видео" + +#: ../midori/midori-view.c:1785 +msgid "Save _Video" +msgstr "Сохранить _видео" + +#: ../midori/midori-view.c:1785 +msgid "Download _Video" +msgstr "Загрузить _видео" + +#: ../midori/midori-view.c:1845 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:1311 +#: ../midori/midori-view.c:1880 +#: ../midori/midori-view.c:1891 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:1321 +#: ../midori/midori-view.c:1912 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1499 +#: ../midori/midori-view.c:2179 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:1516 +#: ../midori/midori-view.c:2202 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:1519 +#: ../midori/midori-view.c:2205 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1523 +#: ../midori/midori-view.c:2209 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:1962 +#: ../midori/midori-view.c:2725 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:2152 +#: ../midori/midori-view.c:2943 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:2153 +#: ../midori/midori-view.c:2944 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:2154 +#: ../midori/midori-view.c:2945 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2946 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2947 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2977 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2994 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:2328 +#: ../midori/midori-view.c:3121 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:2557 -#: ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Но_вая вкладка" - -#: ../midori/midori-view.c:2571 +#: ../midori/midori-view.c:3364 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:2576 +#: ../midori/midori-view.c:3369 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:2576 +#: ../midori/midori-view.c:3369 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Параметры %s" +#: ../midori/midori-view.c:3926 +msgid "Print background images" +msgstr "Печатать фоновые изображения" -#. Page "General" +#: ../midori/midori-view.c:3927 +msgid "Whether background images should be printed" +msgstr "Должны ли быть выведены на печать фоновые изображения" + +#: ../midori/midori-view.c:3971 #: ../midori/midori-preferences.c:398 +msgid "Features" +msgstr "Возможности" + +#. Page "General" +#: ../midori/midori-preferences.c:318 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:319 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:334 +#: ../midori/midori-preferences.c:341 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:351 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Передачи" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:366 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:367 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:369 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:372 msgid "The default font family used to display text" msgstr "Семейство шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:375 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:377 msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:380 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:383 msgid "The font size used to display fixed-width text" msgstr "Размер моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:385 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:388 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Кодировка" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Кодировка символов, которая будет использоваться по умолчанию" - #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:397 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Возможности" - -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Загружать изображения автоматически" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Загружать и отображать изображения автоматически" - -#: ../midori/midori-preferences.c:491 -msgid "Shrink images automatically" -msgstr "Масштабировать изображения автоматически" - -#: ../midori/midori-preferences.c:492 -msgid "Automatically shrink standalone images to fit" -msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Печатать фоновые изображения" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Должны ли быть выведены на печать фоновые изображения" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Изменяемый размер текстовых полей" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Текстовые поля могут изменять размер" - -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Выполнять сценарии" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Выполнять встроенные сценарии на страницах" - -#: ../midori/midori-preferences.c:507 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Использовать модули Netscape" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "Разрешить встроенные объекты модулей Netscape на страницах" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:419 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:420 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:423 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:424 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:434 msgid "Spell Checking" msgstr "Проверка орфографии" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:436 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:437 msgid "Enable spell checking while typing" msgstr "Проверять правописание вводимого текста" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:441 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:449 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:450 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:460 msgid "Browsing" msgstr "Навигация" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:482 msgid "Applications" msgstr "Приложения" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:483 msgid "External applications" msgstr "Внешние приложения" #. Page "Network" -#: ../midori/midori-preferences.c:621 -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:500 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "МБ" - #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:519 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:520 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:668 -#: ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:538 msgid "days" msgstr "дней" -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:335 +#: ../midori/midori-searchaction.c:491 +#: ../katze/katze-arrayaction.c:338 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:923 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:951 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:995 msgid "_Icon:" msgstr "_Значок:" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1009 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1228 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1329 msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 -msgid "Could not run external program." -msgstr "Не удалось выполнить внешнюю программу." - -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:1103 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:1105 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:1106 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:1107 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:1108 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:1109 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:1110 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "С_тили пользователя" +#: ../midori/sokoke.c:1111 +msgid "New _Tab" +msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:1112 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:1113 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:94 +#: ../panels/midori-addons.c:139 msgid "Userscripts" msgstr "Сценарии" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 msgid "Userstyles" msgstr "Стили пользователя" -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-addons.c:294 +#, c-format +msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +msgstr "Установленными считаются пользовательские сценарии, расположенные в «%s» и стили, расположенные в «%s»." + +#: ../panels/midori-addons.c:896 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Отслеживание изменений в «%s» отключено: %s" + +#: ../panels/midori-bookmarks.c:112 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:251 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:259 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:279 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:609 msgid "Separator" msgstr "Разделитель" @@ -1872,11 +2030,19 @@ msgstr "Удалить запись из журнала" msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:598 +msgid "Erroneous clock time" +msgstr "Некорректное время" + +#: ../panels/midori-history.c:599 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "Дата находится в прошлом. Проверьте системное время." + +#: ../panels/midori-history.c:611 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:616 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -1884,11 +2050,11 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:624 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:626 msgid "Yesterday" msgstr "Вчера" @@ -1897,24 +2063,19 @@ msgstr "Вчера" msgid "Netscape plugins" msgstr "Модули Netscape" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s из %s" - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:209 msgid "Authentication Required" msgstr "Требуется авторизация" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:225 msgid "" "A username and a password are required\n" "to open this location:" @@ -1922,14 +2083,18 @@ msgstr "" "Для просмотра этой страницы требуются\n" "имя пользователя и пароль:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:239 msgid "Username" msgstr "Имя пользователя" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:252 msgid "Password" msgstr "Пароль" +#: ../katze/katze-http-auth.c:266 +msgid "_Remember password" +msgstr "_Запомнить пароль" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1944,46 +2109,52 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:483 +#: ../katze/katze-utils.c:874 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:529 +#: ../katze/katze-utils.c:558 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:544 msgid "Choose folder" msgstr "Выберите папку" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Параметры %s" + +#: ../extensions/adblock.c:373 msgid "Configure Advertisement filters" msgstr "Настройка рекламных фильтров" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:405 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Введите адрес списка фильтров в поле ниже и нажмите «Добавить». Подобные списки можно найти на %s." + +#: ../extensions/adblock.c:545 msgid "Configure _Advertisement filters..." msgstr "_Настроить рекламные фильтры..." -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:1099 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:1100 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Цветные вкладки" - -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/colorful-tabs.c:127 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:128 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" @@ -1992,6 +2163,10 @@ msgstr "Каждая вкладка имеет свой цвет" msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Удалить всё" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям." @@ -2073,11 +2248,19 @@ msgstr "Менеджер _фрагментов данных" msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/dnsprefetch.c:194 +msgid "DNS prefetching" +msgstr "Упреждающие запросы DNS" + +#: ../extensions/dnsprefetch.c:195 +msgid "Prefetch IP addresses of hovered links" +msgstr "Упреждающие запросы DNS при наведении на ссылки" + +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." @@ -2088,33 +2271,33 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:667 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:727 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "Л_енты" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не удалось найти корневой элемент в данных XML." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Формат ленты не поддерживается." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не удалось обработать XML-ленту: %s" @@ -2135,33 +2318,55 @@ msgstr "Не удалось найти обязательные элементы msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "Ошибка" + +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" msgstr "Лента «%s» уже была добавлена" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" msgstr "Не удалось загрузить ленту «%s»" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Новая лента" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "Панель лент новостей" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/mouse-gestures/main.c:236 +#: ../extensions/formhistory.c:140 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Не удалось добавить значение: %s\n" + +#: ../extensions/formhistory.c:502 +msgid "Stores history of entered form data" +msgstr "Хранит данные, введённые ранее в формы ввода" + +#: ../extensions/formhistory.c:506 +#, c-format +msgid "Not available: %s" +msgstr "Недоступно: %s" + +#: ../extensions/formhistory.c:507 +msgid "Resource files not installed" +msgstr "Файлы ресурсов не установлены" + +#: ../extensions/formhistory.c:513 +msgid "Form history filler" +msgstr "История форм ввода" + +#: ../extensions/mouse-gestures.c:288 msgid "Mouse Gestures" msgstr "Жесты мышью" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/mouse-gestures.c:289 msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" @@ -2175,19 +2380,23 @@ msgstr "Контейнер" msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Дополнительная область для просмотра страниц" + +#: ../extensions/shortcuts.c:173 msgid "Customize Keyboard shortcuts" msgstr "Настройка комбинаций клавиш" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:265 msgid "Customize Sh_ortcuts..." msgstr "_Настроить клавиши..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:304 msgid "Shortcuts" msgstr "Комбинации клавиш" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:305 msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" @@ -2207,19 +2416,27 @@ msgstr "Настройка возможностей" msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:371 -#: ../extensions/tab-panel.c:431 +#: ../extensions/tab-panel.c:565 +#: ../extensions/tab-panel.c:622 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:415 +#: ../extensions/tab-panel.c:606 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:432 +#: ../extensions/tab-panel.c:623 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" +#: ../extensions/tab-switcher.c:394 +msgid "Tab History List" +msgstr "История вкладок" + +#: ../extensions/tab-switcher.c:395 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Отображает список вкладок в порядке времени последнего использования" + #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Настройка панели инструментов" @@ -2240,14 +2457,48 @@ msgstr "Отображаемые элементы" msgid "Customize _Toolbar..." msgstr "Настроить панель _инструментов..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:612 msgid "Toolbar Editor" msgstr "Редактор панели инструментов" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:614 msgid "Easily edit the toolbar layout" msgstr "Простой редактор панели инструментов" +#: ../extensions/toolbar-editor.c:617 +msgid "Not available on this platform" +msgstr "Недоступно для данной платформы" + +#: ../extensions/web-cache.c:592 +msgid "Cache HTTP communication on disk" +msgstr "Кэширует принятые данные (HTTP) на диске" + +#~ msgid "Shrink images automatically" +#~ msgstr "Масштабировать изображения автоматически" +#~ msgid "Automatically shrink standalone images to fit" +#~ msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" +#~ msgid "Tint tabs distinctly" +#~ msgstr "Цветные вкладки" +#~ msgid "Remember last form inputs" +#~ msgstr "Запоминать введённые в формы данные" +#~ msgid "Whether the last form inputs are saved" +#~ msgstr "Сохранять последние введённые данные в формы ввода" +#~ msgid "Cache size" +#~ msgstr "Размер кэша" +#~ msgid "The allowed size of the cache" +#~ msgstr "Разрешённый размер кэша" +#~ msgid "The character encoding to use by default" +#~ msgstr "Кодировка символов, которая будет использоваться по умолчанию" +#~ msgid "MB" +#~ msgstr "МБ" +#~ msgid "Encoding" +#~ msgstr "Кодировка" +#~ msgid "Resizable text areas" +#~ msgstr "Изменяемый размер текстовых полей" +#~ msgid "Whether text areas are resizable" +#~ msgstr "Текстовые поля могут изменять размер" +#~ msgid "User_styles" +#~ msgstr "С_тили пользователя" #~ msgid "_Closed Tabs and Windows" #~ msgstr "За_крытые вкладки и окна" #~ msgid "Last open pages" @@ -2258,8 +2509,6 @@ msgstr "Простой редактор панели инструментов" #~ msgstr "Значки и текст горизонтально" #~ msgid "Load on Startup" #~ msgstr "Загружать при запуске" -#~ msgid "Download Folder" -#~ msgstr "Папка загрузок" #~ msgid "Configure _Toolbar..." #~ msgstr "Настроить панель _инструментов..." #~ msgid "_Enable" @@ -2270,8 +2519,6 @@ msgstr "Простой редактор панели инструментов" #~ msgstr "_Отключить" #~ msgid "Disable" #~ msgstr "Отключить" -#~ msgid "Whether to detach the chosen panel from the window" -#~ msgstr "Отсоединить выбранную панель от главного окна" #~ msgid "%d days ago" #~ msgstr "%d дней назад" #~ msgid "_Quick Find" @@ -2394,8 +2641,6 @@ msgstr "Простой редактор панели инструментов" #~ msgstr "Показать поиск" #~ msgid "Show the Web search entry in the toolbar" #~ msgstr "Показывать запись сетевого поиска в панели инструментов" -#~ msgid "Show the Trash button in the toolbar" -#~ msgstr "Показать кнопку Корзина в панели инструментов" #~ msgid "Load Finished" #~ msgstr "Загрузка завершена" #~ msgid "The URI of the currently loaded page" diff --git a/po/sk.po b/po/sk.po index 9a9c46e3..09248f28 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Midori 0.1.9-3345559\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-07-29 23:58+0200\n" -"PO-Revision-Date: 2009-10-12 16:32+0200\n" +"PO-Revision-Date: 2009-11-21 15:33+0100\n" "Last-Translator: Robert Hartl \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -2028,11 +2028,11 @@ msgstr "Zoznam, detaily a mazanie cookies" #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "Nepodarilo sa nájsť požadované prvky Atom \"entry\" v dátach XML." #: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "Nepodarilo sa nájsť požadované prvky Atom \"feed\" v dátach XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2074,7 +2074,7 @@ msgstr "Zlyhalo načítanie XML kanála: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Nepodarilo sa nájsť element \"channel\" v RSS XML dátach" +msgstr "Nepodarilo sa nájsť prvok \"channel\" v RSS dátach XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2082,11 +2082,11 @@ msgstr "Našla sa nepodporovaná verzia RSS" #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "Nepodarilo sa nájsť požadované prvky RSS \"item\" v dátach XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" +msgstr "Nepodarilo sa nájsť požadované prvky RSS \"channel\" v dátach XML." #: ../extensions/feed-panel/main.c:114 #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 51177d3f..6b51210a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,16 +1,18 @@ # Simplified Chinese translations for midori package. # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Stanley Zhang 2009 +# Stanley Zhang , 2009. +# Hunt Xu , 2009. # + msgid "" msgstr "" -"Project-Id-Version: midori 0.1.9\n" +"Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-03 09:37+0800\n" -"PO-Revision-Date: 2009-08-03 10:10+0800\n" -"Last-Translator: Stanley Zhang \n" -"Language-Team: Simplified Chinese \n" +"POT-Creation-Date: 2009-09-06 00:44+0200\n" +"PO-Revision-Date: 2009-10-21 13:45+0800\n" +"Last-Translator: Hunt Xu \n" +"Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,862 +20,838 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "轻量的 Web 浏览器" +msgstr "轻量的网页浏览器" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1343 -#: ../midori/main.c:1517 -#: ../midori/main.c:1525 -#: ../midori/main.c:1536 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1435 ../midori/main.c:1609 +#: ../midori/main.c:1617 ../midori/main.c:1628 #: ../midori/midori-websettings.c:287 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Web 浏览器" +msgstr "网页浏览器" -#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "设置无法加载: %s\n" +msgstr "无法载入配置: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "值 '%s' 在 '%s' 中无效" +msgstr "值 '%s' 在 %s 中无效" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:164 ../midori/main.c:245 #, c-format msgid "Invalid configuration value '%s'" msgstr "无效的设置值 '%s'" -#: ../midori/main.c:350 +#: ../midori/main.c:369 #, c-format msgid "Failed to open database: %s\n" msgstr "打开数据库失败: %s\n" -#: ../midori/main.c:382 +#: ../midori/main.c:401 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:455 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" -#: ../midori/main.c:460 +#: ../midori/main.c:479 #, c-format msgid "Failed to clear history: %s\n" msgstr "清空历史失败: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:502 ../midori/main.c:536 ../midori/main.c:552 #, c-format msgid "Failed to add history item: %s\n" msgstr "添加历史项失败: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:731 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:760 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "配置无法保存. %s" +msgstr "配置无法保存。%s" -#: ../midori/main.c:779 +#: ../midori/main.c:798 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "搜索引擎无法保存. %s" +msgstr "搜索引擎无法保存。%s" -#: ../midori/main.c:798 -#: ../midori/main.c:826 -#: ../midori/main.c:855 +#: ../midori/main.c:817 ../midori/main.c:845 ../midori/main.c:874 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "书签无法保存. %s" +msgstr "书签无法保存。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 -#: ../midori/main.c:901 +#: ../midori/main.c:897 ../midori/main.c:920 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "垃圾箱无法保存. %s" +msgstr "回收站无法保存。%s" -#: ../midori/main.c:974 +#: ../midori/main.c:993 #, c-format msgid "The session couldn't be saved. %s" -msgstr "会话无法保存. %s" +msgstr "会话无法保存。%s" -#: ../midori/main.c:1101 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现, 请尝试下面的选项来解决此问题." +#: ../midori/main.c:1190 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori 好像在上次运行时崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此" +"问题。" -#: ../midori/main.c:1116 +#: ../midori/main.c:1205 msgid "Modify _preferences" -msgstr "修改首选项(_p)" +msgstr "修改首选项(_P)" -#: ../midori/main.c:1120 +#: ../midori/main.c:1209 msgid "Reset the last _session" -msgstr "重置最后的会话(_s)" +msgstr "重置最后的会话(_S)" -#: ../midori/main.c:1125 +#: ../midori/main.c:1214 msgid "Disable all _extensions" -msgstr "关闭所有的扩展(_e)" +msgstr "禁用所有扩展(_E)" -#: ../midori/main.c:1343 +#: ../midori/main.c:1435 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1366 +#: ../midori/main.c:1458 msgid "An unknown error occured." -msgstr "发生了一个未知的错误." +msgstr "发生了一个未知的错误。" -#: ../midori/main.c:1398 +#: ../midori/main.c:1490 #, c-format msgid "Snapshot saved to: %s\n" msgstr "截图保存到: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1539 msgid "Run ADDRESS as a web application" -msgstr "将 ADDRESS 作为 Web 应用程序运行" +msgstr "将 ADDRESS 作为 web 应用程序运行" -#: ../midori/main.c:1447 +#: ../midori/main.c:1539 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1449 +#: ../midori/main.c:1541 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作为设置目录" -#: ../midori/main.c:1449 +#: ../midori/main.c:1541 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1451 +#: ../midori/main.c:1543 msgid "Run the specified filename as javascript" -msgstr "将指定的文件当作 Javascript 执行" +msgstr "将指定的文件当作 javascript 执行" -#: ../midori/main.c:1454 +#: ../midori/main.c:1546 msgid "Take a snapshot of the specified URI" msgstr "对指定 URI 截图" -#: ../midori/main.c:1457 +#: ../midori/main.c:1549 msgid "Execute the specified command" msgstr "执行特定命令" -#: ../midori/main.c:1459 +#: ../midori/main.c:1551 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1461 +#: ../midori/main.c:1553 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1514 +#: ../midori/main.c:1606 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1629 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1539 +#: ../midori/main.c:1631 msgid "Check for new versions at:" -msgstr "在此检查新版本:" +msgstr "在此检查新的版本:" -#: ../midori/main.c:1619 +#: ../midori/main.c:1711 msgid "The specified configuration folder is invalid." -msgstr "无效的配置文件目录. " +msgstr "无效的配置文件目录。" -#: ../midori/main.c:1655 +#: ../midori/main.c:1751 msgid "An instance of Midori is already running but not responding.\n" -msgstr "已经有一个 Midori 在运行, 但没有响应.\n" +msgstr "已经有一个 Midori 在运行，但是无法响应。\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1795 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "搜索引擎无法加载. %s\n" +msgstr "搜索引擎无法加载。%s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1813 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1742 +#: ../midori/main.c:1828 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1755 +#: ../midori/main.c:1841 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "垃圾箱无法加载: %s\n" +msgstr "回收站无法加载: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:1854 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:1866 msgid "The following errors occured:" -msgstr "发生以下错误:" +msgstr "发生了以下错误:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1882 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:251 msgid "File not found." -msgstr "没有找到文件." +msgstr "没有找到文件。" -#: ../midori/midori-array.c:258 -#: ../midori/midori-array.c:267 +#: ../midori/midori-array.c:260 ../midori/midori-array.c:270 msgid "Malformed document." -msgstr "异常的文件." +msgstr "异常的文件。" -#: ../midori/midori-array.c:429 -#: ../midori/sokoke.c:694 +#: ../midori/midori-array.c:432 ../midori/sokoke.c:699 #, c-format msgid "Writing failed." -msgstr "写失败." +msgstr "写入失败。" -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4260 -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4333 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4263 +#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:4330 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:417 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:442 #, c-format msgid "Unexpected action '%s'." -msgstr "意外的活动 '%s'." +msgstr "意外的活动 '%s'。" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:627 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:627 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:629 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:629 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:659 msgid "_Title:" -msgstr "标题(_T): " +msgstr "标题(_T):" -#: ../midori/midori-browser.c:661 -#: ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:672 ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:680 -#: ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:691 ../midori/midori-searchaction.c:966 +#: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:710 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:704 -#: ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:715 ../midori/midori-browser.c:756 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:834 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1203 +#: ../midori/midori-browser.c:1211 ../panels/midori-transfers.c:272 +#, c-format +msgid "%s of %s" +msgstr "已下载 %s，共 %s" + +#: ../midori/midori-browser.c:1248 #, c-format msgid "The file '%s' has been downloaded." -msgstr "文件 '%s' 已下载." +msgstr "文件 '%s' 已下载。" -#: ../midori/midori-browser.c:1207 +#: ../midori/midori-browser.c:1252 msgid "Transfer completed" msgstr "下载完成" -#: ../midori/midori-browser.c:1348 +#: ../midori/midori-browser.c:1393 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2015 +#: ../midori/midori-browser.c:2060 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:3461 -#: ../panels/midori-bookmarks.c:781 +#: ../midori/midori-browser.c:3268 ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "新建订阅" + +#: ../midori/midori-browser.c:3523 ../panels/midori-bookmarks.c:781 #: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:3468 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3530 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:3471 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3533 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3843 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3847 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:3798 +#: ../midori/midori-browser.c:3860 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:3808 -#: ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:3870 ../midori/midori-preferences.c:665 #: ../panels/midori-history.c:108 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:3875 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3818 +#: ../midori/midori-browser.c:3880 msgid "'Flash' Cookies" -msgstr "由 Flash 建立的 Cookies" +msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:3823 +#: ../midori/midori-browser.c:3885 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:3828 -#: ../midori/sokoke.c:868 +#: ../midori/midori-browser.c:3890 ../midori/sokoke.c:873 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:3836 +#: ../midori/midori-browser.c:3898 msgid "Clear private data when _quitting Midori" -msgstr "退出 Midori 前清除隐私数据" +msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:3979 msgid "A lightweight web browser." -msgstr "轻量级的 Web 浏览器." +msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:3995 msgid "translator-credits" -msgstr "张翼 " +msgstr "" +"张翼 " +"Hunt Xu " -#: ../midori/midori-browser.c:4194 +#: ../midori/midori-browser.c:4261 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:4196 -#: ../midori/sokoke.c:869 +#: ../midori/midori-browser.c:4263 ../midori/sokoke.c:874 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:4197 +#: ../midori/midori-browser.c:4264 msgid "Open a new window" -msgstr "新建窗口" +msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:4200 +#: ../midori/midori-browser.c:4267 msgid "Open a new tab" -msgstr "新建标签页" +msgstr "打开一个新标签" -#: ../midori/midori-browser.c:4203 +#: ../midori/midori-browser.c:4270 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:4206 +#: ../midori/midori-browser.c:4273 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:4208 +#: ../midori/midori-browser.c:4275 msgid "Add to Speed _dial" -msgstr "添加到快速拨号(_d)" +msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:4209 +#: ../midori/midori-browser.c:4276 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4278 msgid "_Close Tab" -msgstr "关闭标签页(_C)" +msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:4212 +#: ../midori/midori-browser.c:4279 msgid "Close the current tab" -msgstr "关闭当前标签页" +msgstr "关闭当前标签" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4281 msgid "C_lose Window" -msgstr "关闭窗口(_l)" +msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:4282 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:4285 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:4221 +#: ../midori/midori-browser.c:4288 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4290 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4293 msgid "Cut the selected text" -msgstr "剪切选中的文本" +msgstr "剪切" -#: ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4296 ../midori/midori-browser.c:4299 msgid "Copy the selected text" -msgstr "复制选中的文本" +msgstr "复制" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4302 msgid "Paste text from the clipboard" -msgstr "从剪贴板粘帖文本" +msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4305 msgid "Delete the selected text" -msgstr "删除选中的文本" +msgstr "删除" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:4308 msgid "Select all text" -msgstr "选取所有文本" +msgstr "全选" -#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4311 msgid "Find a word or phrase in the page" -msgstr "在页面中查找词或短语" +msgstr "在页面中查找" -#: ../midori/midori-browser.c:4246 +#: ../midori/midori-browser.c:4313 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4314 msgid "Find the next occurrence of a word or phrase" -msgstr "查找下一处" +msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:4249 +#: ../midori/midori-browser.c:4316 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4317 msgid "Find the previous occurrence of a word or phrase" -msgstr "查找上一处" +msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:4254 +#: ../midori/midori-browser.c:4321 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:4256 +#: ../midori/midori-browser.c:4323 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4324 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:4269 +#: ../midori/midori-browser.c:4336 msgid "Increase the zoom level" -msgstr "提高放大倍数" +msgstr "放大" -#: ../midori/midori-browser.c:4272 +#: ../midori/midori-browser.c:4339 msgid "Decrease the zoom level" -msgstr "缩小放大倍数" +msgstr "缩小" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4342 msgid "Reset the zoom level" -msgstr "重置放大倍数" +msgstr "恢复默认大小" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4343 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4345 msgid "View So_urce" -msgstr "查看源码(_u)" +msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4346 msgid "View the source code of the page" -msgstr "查看本页的源代码" +msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4348 msgid "View Selection Source" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4349 msgid "View the source code of the selection" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4353 msgid "Toggle fullscreen view" -msgstr "全屏浏览" +msgstr "切换全屏" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4355 msgid "_Go" -msgstr "位置(_G)" +msgstr "前进(_G)" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4358 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:4361 msgid "Go forward to the next page" msgstr "转到下一页" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4364 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:4366 msgid "Empty Trash" -msgstr "清空垃圾箱" +msgstr "清空回收站" -#: ../midori/midori-browser.c:4300 +#: ../midori/midori-browser.c:4367 msgid "Delete the contents of the trash" -msgstr "删除垃圾箱中的内容" +msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4369 msgid "Undo _Close Tab" -msgstr "撤销关闭标签页(_C)" +msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4370 msgid "Open the last closed tab" -msgstr "打开最后关闭的标签页" +msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:4307 -#: ../panels/midori-bookmarks.c:231 +#: ../midori/midori-browser.c:4374 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" -msgstr "添加一个新书签" +msgstr "添加新书签" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4376 msgid "Add a new _folder" -msgstr "添加新目录(_f)" +msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4377 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:4312 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:4379 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4380 msgid "Add, edit and remove search engines..." -msgstr "添加, 编辑和移除搜索引擎" +msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4383 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4384 msgid "Clear private data..." -msgstr "清除隐私数据" +msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4388 msgid "_Previous Tab" -msgstr "上一个标签页(_P)" +msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:4389 msgid "Switch to the previous tab" -msgstr "转到上一个标签页" +msgstr "转到上一个标签" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4391 msgid "_Next Tab" -msgstr "下一个标签页(_N)" +msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:4392 msgid "Switch to the next tab" -msgstr "转到上一个标签页" +msgstr "转到下一个标签" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4394 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4396 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4397 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:4332 +#: ../midori/midori-browser.c:4399 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4400 msgid "Show the Frequently Asked Questions" -msgstr "显示常见问题" +msgstr "显示 FAQ" -#: ../midori/midori-browser.c:4335 +#: ../midori/midori-browser.c:4402 msgid "_Report a Bug" -msgstr "反馈错误(_R)" +msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4403 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:4406 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4413 msgid "P_rivate Browsing" -msgstr "隐私浏览(_r)" +msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:4347 +#: ../midori/midori-browser.c:4414 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4419 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:4353 +#: ../midori/midori-browser.c:4420 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:4423 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:4357 +#: ../midori/midori-browser.c:4424 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:4360 +#: ../midori/midori-browser.c:4427 msgid "Side_panel" -msgstr "侧边栏(_p)" +msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:4428 msgid "Show sidepanel" -msgstr "显示侧边栏" +msgstr "显示侧栏" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4431 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4432 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:4368 +#: ../midori/midori-browser.c:4435 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:4369 +#: ../midori/midori-browser.c:4436 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:4439 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:4373 +#: ../midori/midori-browser.c:4440 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4447 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:4383 -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4450 ../midori/midori-websettings.c:214 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4387 +#: ../midori/midori-browser.c:4454 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:4390 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4457 ../midori/midori-websettings.c:216 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:4393 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:4460 ../midori/midori-websettings.c:217 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4396 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:4463 ../midori/midori-websettings.c:218 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:4399 -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:4466 ../midori/midori-websettings.c:219 #: ../midori/midori-websettings.c:291 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:4907 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4914 msgid "_Location..." -msgstr "位置(_L)" +msgstr "位置(_L)..." -#: ../midori/midori-browser.c:4846 +#: ../midori/midori-browser.c:4916 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4940 msgid "_Web Search..." -msgstr "搜索 Web(_W)" +msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:4942 msgid "Run a web search" -msgstr "执行 Web 搜索" +msgstr "运行网页搜索" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4963 msgid "Reopen a previously closed tab or window" -msgstr "重新打开以前关闭的标签页或窗口" +msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4978 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:4980 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:4925 -#: ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:4995 ../midori/sokoke.c:862 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4997 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5012 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:5024 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5026 msgid "Show a list of all open tabs" -msgstr "显示所有标签页的列表" +msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5040 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:5042 msgid "Menu" msgstr "菜单" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5228 msgid "_Inline Find:" -msgstr "查找(_I):" +msgstr "在文中查找(_I):" -#: ../midori/midori-browser.c:5183 +#: ../midori/midori-browser.c:5253 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:5258 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:5263 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5271 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:5281 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:5246 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "删除所有项目" +#: ../midori/midori-browser.c:5316 ../panels/midori-transfers.c:143 +msgid "Clear All" +msgstr "清除所有项目" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5670 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:941 #, c-format msgid "Search with %s" msgstr "用 %s 搜索" -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 +#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 msgid "Detach chosen panel from the window" msgstr "从窗口中分离选择的面板" -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 +#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 msgid "Align sidepanel to the right" -msgstr "侧边栏摆放到右侧" +msgstr "侧栏在右" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 msgid "Close panel" -msgstr "关闭侧边栏" +msgstr "关闭侧栏" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 msgid "Align sidepanel to the left" -msgstr "侧边栏摆放到左侧" +msgstr "侧栏在左" #: ../midori/midori-panel.c:704 msgid "Show panel _titles" -msgstr "显示面板标题(_t)" +msgstr "显示面板标题(_T)" #: ../midori/midori-panel.c:712 msgid "Show operating _controls" -msgstr "显示操作控件(_c)" +msgstr "显示操作控件(_O)" #: ../midori/midori-panel.c:783 msgid "Options" @@ -889,7 +867,7 @@ msgstr "显示主页" #: ../midori/midori-websettings.c:199 msgid "Show last open tabs" -msgstr "显示最后打开的标签页" +msgstr "显示最后打开的标签" #: ../midori/midori-websettings.c:215 msgid "Japanese (SHIFT_JIS)" @@ -897,7 +875,7 @@ msgstr "日语 (SHIFT_JIS)" #: ../midori/midori-websettings.c:234 msgid "New tab" -msgstr "新建标签页" +msgstr "新建标签" #: ../midori/midori-websettings.c:235 msgid "New window" @@ -905,11 +883,11 @@ msgstr "新建窗口" #: ../midori/midori-websettings.c:236 msgid "Current tab" -msgstr "当前标签页" +msgstr "当前标签" #: ../midori/midori-websettings.c:251 msgid "Default" -msgstr "缺省" +msgstr "默认" #: ../midori/midori-websettings.c:252 msgid "Icons" @@ -935,8 +913,7 @@ msgstr "所有 Cookies" msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 #: ../extensions/shortcuts.c:93 msgid "None" msgstr "无" @@ -979,24 +956,24 @@ msgstr "上次保存的窗口高度" #: ../midori/midori-websettings.c:387 msgid "Last panel position" -msgstr "上次的侧边栏位置" +msgstr "上次的侧栏位置" #: ../midori/midori-websettings.c:388 msgid "The last saved panel position" -msgstr "上次保存的侧边栏位置" +msgstr "上次保存的侧栏位置" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:397 msgid "Last panel page" -msgstr "上次的侧边栏页" +msgstr "上次的侧栏页" #: ../midori/midori-websettings.c:398 msgid "The last saved panel page" -msgstr "上次保存的侧边栏页" +msgstr "上次保存的侧栏页" #: ../midori/midori-websettings.c:406 msgid "Last Web search" -msgstr "上次的 Web 搜索" +msgstr "上次使用的 Web 搜索" #: ../midori/midori-websettings.c:407 msgid "The last saved Web search" @@ -1028,11 +1005,11 @@ msgstr "是否显示书签栏" #: ../midori/midori-websettings.c:443 msgid "Show Panel" -msgstr "显示侧边栏" +msgstr "显示侧栏" #: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" -msgstr "是否显示侧边栏" +msgstr "是否显示侧栏" #: ../midori/midori-websettings.c:459 msgid "Show Transferbar" @@ -1060,11 +1037,11 @@ msgstr "工具栏的样式" #: ../midori/midori-websettings.c:495 msgid "Show progress in location entry" -msgstr "在地址输入框中显示进度" +msgstr "在地址栏中显示进度" #: ../midori/midori-websettings.c:496 msgid "Whether to show loading progress in the location entry" -msgstr "是否在地址输入框中显示加载进度" +msgstr "是否在地址栏中显示加载进度" #: ../midori/midori-websettings.c:511 msgid "Search engines in location completion" @@ -1084,11 +1061,11 @@ msgstr "在工具栏中显示的项目" #: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" -msgstr "紧凑侧边栏" +msgstr "紧凑侧栏" #: ../midori/midori-websettings.c:530 msgid "Whether to make the sidepanel compact" -msgstr "是否让侧边栏紧凑显示" +msgstr "是否让侧栏紧凑显示" #: ../midori/midori-websettings.c:545 msgid "Show operating controls of the panel" @@ -1100,11 +1077,11 @@ msgstr "是否显示面板的操作控件" #: ../midori/midori-websettings.c:561 msgid "Align sidepanel on the right" -msgstr "侧边栏摆放到右侧" +msgstr "侧栏在右" #: ../midori/midori-websettings.c:562 msgid "Whether to align the sidepanel on the right" -msgstr "让侧边栏摆放到右侧" +msgstr "是否让侧栏摆放到右侧" #: ../midori/midori-websettings.c:571 msgid "When Midori starts:" @@ -1112,7 +1089,7 @@ msgstr "当 Midori 启动时:" #: ../midori/midori-websettings.c:572 msgid "What to do when Midori starts" -msgstr "Midori启动时做什么" +msgstr "Midori 启动时做什么" #: ../midori/midori-websettings.c:581 msgid "Homepage:" @@ -1133,11 +1110,11 @@ msgstr "当 Midori 崩溃后显示提示对话框" #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:614 msgid "Show speed dial in new tabs" -msgstr "在新标签页中显示快速拨号" +msgstr "在新标签中显示快速拨号" #: ../midori/midori-websettings.c:615 msgid "Show speed dial in newly opened tabs" -msgstr "在新标签页中显示快速拨号" +msgstr "在新标签中显示快速拨号" #: ../midori/midori-websettings.c:623 msgid "Save downloaded files to:" @@ -1193,7 +1170,7 @@ msgstr "地址栏查找" #: ../midori/midori-websettings.c:711 msgid "The search to perform inside the location entry" -msgstr "在地址输入框中执行的查找" +msgstr "在地址栏中执行的查找" #: ../midori/midori-websettings.c:719 msgid "Preferred Encoding" @@ -1213,31 +1190,31 @@ msgstr "总是显示标签栏" #: ../midori/midori-websettings.c:739 msgid "Close Buttons on Tabs" -msgstr "标签栏上显示关闭按钮" +msgstr "在标签上显示关闭按钮" #: ../midori/midori-websettings.c:740 msgid "Whether tabs have close buttons" -msgstr "是否在标签栏上显示关闭按钮" +msgstr "是否在标签上显示关闭按钮" #: ../midori/midori-websettings.c:748 msgid "Open new pages in:" -msgstr "打开新的页面在:" +msgstr "在...打开新的页面:" #: ../midori/midori-websettings.c:749 msgid "Where to open new pages" -msgstr "在那里打开新的页面" +msgstr "在哪里打开新的页面" #: ../midori/midori-websettings.c:758 msgid "Open external pages in:" -msgstr "打开外部页面在:" +msgstr "在...打开外部页面:" #: ../midori/midori-websettings.c:759 msgid "Where to open externally opened pages" -msgstr "在那里打开外部页面" +msgstr "在哪里打开外部页面" #: ../midori/midori-websettings.c:768 msgid "Middle click opens Selection" -msgstr "鼠标中键打开地址" +msgstr "鼠标中键打开所选地址" #: ../midori/midori-websettings.c:769 msgid "Load an address from the selection via middle click" @@ -1245,27 +1222,27 @@ msgstr "用鼠标中键单击打开选中地址" #: ../midori/midori-websettings.c:777 msgid "Open tabs in the background" -msgstr "在后台打开标签页" +msgstr "在后台打开新标签" #: ../midori/midori-websettings.c:778 msgid "Whether to open new tabs in the background" -msgstr "是否在后台打开标签页" +msgstr "是否在后台打开新标签" #: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" -msgstr "在当前标签页后打开新标签" +msgstr "在当前标签后打开新标签" #: ../midori/midori-websettings.c:787 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开" +msgstr "选择在当前标签后或者在最后的标签后打开新标签" #: ../midori/midori-websettings.c:795 msgid "Open popups in tabs" -msgstr "在标签页中打开弹出窗口" +msgstr "弹出窗口在新标签中打开" #: ../midori/midori-websettings.c:796 msgid "Whether to open popup windows in tabs" -msgstr "是否在标签页中打开弹出窗口" +msgstr "弹出窗口是否在新标签中打开" #: ../midori/midori-websettings.c:812 msgid "Zoom Text and Images" @@ -1277,11 +1254,11 @@ msgstr "是否缩放文字和图像" #: ../midori/midori-websettings.c:828 msgid "Find inline while typing" -msgstr "输入时在线查找" +msgstr "输入时回忆" #: ../midori/midori-websettings.c:829 msgid "Whether to automatically find inline while typing" -msgstr "是否输入时自动在线查找" +msgstr "是否输入时自动查找" #: ../midori/midori-websettings.c:837 msgid "Accept cookies" @@ -1305,7 +1282,7 @@ msgstr "最长 Cookie 有效期" #: ../midori/midori-websettings.c:857 msgid "The maximum number of days to save cookies for" -msgstr "最长保存 Cookie 多少天" +msgstr "最长 Cookie 保存天数" #: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" @@ -1321,7 +1298,7 @@ msgstr "最长历史有效期" #: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" -msgstr "最长保存历史多少天" +msgstr "最长历史保存天数" #: ../midori/midori-websettings.c:885 msgid "Remember last form inputs" @@ -1388,148 +1365,158 @@ msgstr "清除隐私数据" msgid "The private data selected for deletion" msgstr "选中要删除的隐私数据" -#: ../midori/midori-view.c:781 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "页面 '%s' 无法加载." - #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:782 ../midori/midori-view.c:3043 +#: ../midori/midori-view.c:3047 +#, c-format +msgid "Error - %s" +msgstr "错误 - %s" + #: ../midori/midori-view.c:783 -#: ../midori/midori-view.c:3019 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "错误" +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "页面 '%s' 无法加载。" -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:788 msgid "Try again" msgstr "重试" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 -#: ../midori/midori-view.c:3023 +#: ../midori/midori-view.c:821 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1218 msgid "Open _Link" msgstr "打开链接(_L)" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1220 msgid "Open Link in New _Tab" -msgstr "在新标签页中打开链接(_T)" +msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1237 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:1235 +#: ../midori/midori-view.c:1243 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:1241 +#: ../midori/midori-view.c:1249 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:1250 +#: ../midori/midori-view.c:1258 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1287 msgid "Search _with" -msgstr "搜索(_w)" +msgstr "使用...搜索(_W)" -#: ../midori/midori-view.c:1311 +#: ../midori/midori-view.c:1319 msgid "_Search the Web" -msgstr "搜索 Web(_S)" +msgstr "搜索网页(_S)" -#: ../midori/midori-view.c:1321 +#: ../midori/midori-view.c:1329 msgid "Open Address in New _Tab" -msgstr "在新标签页中打开地址(_T)" +msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:1499 +#: ../midori/midori-view.c:1507 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:1516 +#: ../midori/midori-view.c:1524 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:1519 +#: ../midori/midori-view.c:1527 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1523 +#: ../midori/midori-view.c:1531 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:1962 +#: ../midori/midori-view.c:1981 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:2152 +#: ../midori/midori-view.c:2176 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:2153 +#: ../midori/midori-view.c:2177 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:2154 +#: ../midori/midori-view.c:2178 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2179 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2180 msgid "Are you sure you want to delete this shortcut?" -msgstr "确认删除此快捷方式?" +msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2210 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2227 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:2328 +#: ../midori/midori-view.c:2352 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:2557 -#: ../midori/sokoke.c:865 +#: ../midori/midori-view.c:2581 ../midori/sokoke.c:870 msgid "New _Tab" -msgstr "新建标签页(_T)" +msgstr "新建标签(_T)" -#: ../midori/midori-view.c:2571 +#: ../midori/midori-view.c:2595 msgid "_Duplicate Tab" -msgstr "复制标签页(_D)" +msgstr "复制标签(_D)" -#: ../midori/midori-view.c:2576 +#: ../midori/midori-view.c:2600 msgid "_Restore Tab" -msgstr "恢复标签页(_R)" +msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:2576 +#: ../midori/midori-view.c:2600 msgid "_Minimize Tab" -msgstr "最小化标签页(_M)" +msgstr "最小化标签(_M)" + +#: ../midori/midori-view.c:3149 +msgid "Print background images" +msgstr "打印背景图片" + +#: ../midori/midori-view.c:3150 +msgid "Whether background images should be printed" +msgstr "是否打印页面的背景图片" + +#: ../midori/midori-view.c:3194 ../midori/midori-preferences.c:484 +msgid "Features" +msgstr "特性" #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" -msgstr "%s 的设置项" +msgstr "%s 的首选项" #. Page "General" #: ../midori/midori-preferences.c:398 @@ -1544,8 +1531,7 @@ msgstr "启动" msgid "Use current page as homepage" msgstr "设置当前页为主页" -#: ../midori/midori-preferences.c:425 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "文件传输" @@ -1560,27 +1546,27 @@ msgstr "字体设置" #: ../midori/midori-preferences.c:443 msgid "Default Font Family" -msgstr "缺省的字体" +msgstr "默认的字体族" #: ../midori/midori-preferences.c:447 msgid "The default font family used to display text" -msgstr "显示文字的缺省字体" +msgstr "默认用以显示文字的字体族" #: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" -msgstr "显示文字的缺省字体大小" +msgstr "默认用以显示文字的字体大小" #: ../midori/midori-preferences.c:453 msgid "Fixed-width Font Family" -msgstr "定宽字体" +msgstr "定宽字体族" #: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" -msgstr "显示定宽文本的字形" +msgstr "用以显示定宽文本的字体族" #: ../midori/midori-preferences.c:460 msgid "The font size used to display fixed-width text" -msgstr "显示定宽文本的字体大小" +msgstr "用以显示定宽文本的字体大小" #: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" @@ -1588,7 +1574,7 @@ msgstr "最小字体尺寸" #: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" -msgstr "显示文字的最小字体尺寸" +msgstr "用以显示文字的最小字体尺寸" #: ../midori/midori-preferences.c:473 msgid "Encoding" @@ -1596,19 +1582,14 @@ msgstr "编码" #: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" -msgstr "缺省的字符编码" +msgstr "默认的字符编码" #. Page "Behavior" #: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "特性" - -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "自动加载图像" @@ -1616,129 +1597,111 @@ msgstr "自动加载图像" msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:492 msgid "Shrink images automatically" msgstr "自动缩小图像" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:493 msgid "Automatically shrink standalone images to fit" msgstr "自动缩小单独的图像以适合屏幕" -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "打印背景图" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "是否打印页面的背景图" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "可缩放的文本区" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "文本区能否缩放" - -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-preferences.c:499 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../midori/midori-preferences.c:507 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "启用 Netscape 插件" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded Netscape plugin objects" msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:507 msgid "Enforce 96 dots per inch" -msgstr "强制每英寸96点" +msgstr "强制每英寸 96 点" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:508 msgid "Enforce a video dot density of 96 DPI" -msgstr "强制画面点密度为 96DPI" +msgstr "强制画面点密度为 96 DPI" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:511 msgid "Enable developer tools" msgstr "启用开发工具" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:512 msgid "Enable special extensions for developers" -msgstr "启用给开发者的特殊扩展" +msgstr "启用为开发者准备的特殊扩展" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:519 msgid "Spell Checking" msgstr "拼写检查" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:522 msgid "Enable Spell Checking" msgstr "启用拼写检查" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:523 msgid "Enable spell checking while typing" -msgstr "启用输入时拼写检查" +msgstr "输入时启用拼写检查" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "用逗号分隔的语言列表, 比如 \"zh_CN,en_GB\"" +#: ../midori/midori-preferences.c:527 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"用以拼写检查的语言列表，用逗号分隔，比如 \"zh_CN,en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:532 msgid "Interface" msgstr "界面" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:533 msgid "Navigationbar" -msgstr "导航条" +msgstr "导航栏" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:544 msgid "Browsing" msgstr "浏览" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:568 msgid "Applications" -msgstr "应用" +msgstr "应用程序" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:569 msgid "External applications" msgstr "外部应用程序" #. Page "Network" -#: ../midori/midori-preferences.c:621 -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:615 ../midori/midori-preferences.c:616 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:643 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:648 msgid "Privacy" msgstr "隐私" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:649 msgid "Web Cookies" -msgstr "网页 Cookies" +msgstr "Web Cookies" -#: ../midori/midori-preferences.c:668 -#: ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:662 ../midori/midori-preferences.c:672 msgid "days" msgstr "天" -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:335 +#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "清空" @@ -1752,11 +1715,11 @@ msgstr "编辑搜索引擎" #: ../midori/midori-searchaction.c:936 msgid "_Name:" -msgstr "名称(_N)" +msgstr "名称(_N):" #: ../midori/midori-searchaction.c:980 msgid "_Icon:" -msgstr "图标(_I)" +msgstr "图标(_I):" #: ../midori/midori-searchaction.c:994 msgid "_Token:" @@ -1768,60 +1731,57 @@ msgstr "管理搜索引擎" #: ../midori/midori-searchaction.c:1312 msgid "Use as _default" -msgstr "作为缺省(_d)" +msgstr "作为默认(_D)" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:166 ../midori/sokoke.c:178 msgid "Could not run external program." -msgstr "无法运行外部程序." +msgstr "无法运行外部程序。" -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:861 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:863 msgid "Add Boo_kmark" -msgstr "添加书签(_k)" +msgstr "添加书签(_K)" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:864 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:865 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:866 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:867 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:868 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:869 msgid "User_styles" -msgstr "用户样式(_s)" +msgstr "用户样式(_S)" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:871 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:872 msgid "Netscape p_lugins" -msgstr "Netscape 插件(_l)" +msgstr "Netscape 插件(_L)" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "用户脚本" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "用户样式" @@ -1855,7 +1815,7 @@ msgstr "扩展" #: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" -msgstr "确认删除所有的历史项?" +msgstr "确认删除所有的历史项？" #: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" @@ -1874,10 +1834,10 @@ msgid "A week ago" msgstr "一周以前" #: ../panels/midori-history.c:606 +#, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 天以前" -msgstr[1] "%d 天以前" #: ../panels/midori-history.c:614 msgid "Today" @@ -1887,29 +1847,23 @@ msgstr "今天" msgid "Yesterday" msgstr "昨天" -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:108 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape 插件" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "已下载 %s, 共 %s " - -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:480 msgid "Open Destination _Folder" msgstr "打开保存文件目录(_F)" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:483 msgid "Copy Link Loc_ation" -msgstr "复制链接地址(_a)" +msgstr "复制链接地址(_A)" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:124 msgid "Authentication Required" msgstr "需要认证" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:140 msgid "" "A username and a password are required\n" "to open this location:" @@ -1917,11 +1871,11 @@ msgstr "" "需要输入用户名和密码\n" "以打开此位置:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:154 msgid "Username" msgstr "用户名" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:170 msgid "Password" msgstr "密码" @@ -1939,14 +1893,12 @@ msgstr "库存图标 '%s' 无法加载" msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 #, c-format msgid "Property '%s' is invalid for %s" msgstr "属性 '%s' 在 '%s' 中无效" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 msgid "Choose file" msgstr "选择文件" @@ -1960,13 +1912,13 @@ msgstr "设置广告过滤器" #: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." -msgstr "设置广告过滤器(_A)" +msgstr "设置广告过滤器(_A)..." -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:565 msgid "Advertisement blocker" msgstr "广告拦截器" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:566 msgid "Block advertisements according to a filter list" msgstr "使用过滤列表拦截广告" @@ -1980,16 +1932,23 @@ msgstr "多彩标签" #: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" -msgstr "用不同颜色区分标签页" +msgstr "用不同颜色区分标签" #: ../extensions/cookie-manager/cookie-manager-page.c:79 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Cookie 管理器" +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "删除所有" + #: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "删除所有 Cookies. 如果已设置了一个过滤器, 则只删除匹配过滤字符串的 Cookies." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"删除所有 Cookies。如果已设置了一个过滤器，则只删除匹配过滤字符串的 Cookies。" #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" @@ -2001,7 +1960,7 @@ msgstr "折叠所有项目" #: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" -msgstr "确认删除所有的 Cookie?" +msgstr "确认删除所有的 Cookie？" #: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" @@ -2030,7 +1989,7 @@ msgstr "" "值: %s\n" "路径: %s\n" "安全: %s\n" -"过期: %s" +"有效期: %s" #: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" @@ -2038,7 +1997,7 @@ msgstr "是" #: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" -msgstr "无" +msgstr "否" #: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" @@ -2057,8 +2016,10 @@ msgid "Filter:" msgstr "过滤器(_F):" #: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "输入过滤字符串以只显示域名相符的 Cookies" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "输入过滤字符串以只显示名称或主机名相符的 Cookies" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2066,22 +2027,22 @@ msgstr "Cookie 管理器(_C)" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "查看和删除 Cookies" +msgstr "列出、查看和删除 Cookies" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/feed-panel/feed-atom.c:237 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "查找必需的 XML 数据中的 Atom \"entry\" 元素失败." +msgstr "查找必须的 XML 数据中的 Atom \"entry\" 元素失败。" -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:343 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "查找必需的 XML 数据中的 Atom \"feed\" 元素失败." +msgstr "查找必需的 XML 数据中的 Atom \"feed\" 元素失败。" #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "最后更新: %s." +msgstr "最后更新: %s。" #: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" @@ -2099,58 +2060,58 @@ msgstr "删除所有订阅" msgid "_Feeds" msgstr "订阅(_F)" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "查找订阅的 XML 数据根元素失败." +msgstr "查找订阅的 XML 数据根元素失败。" -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." -msgstr "不支持的订阅格式." +msgstr "不支持的订阅格式。" -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "解析 XML 订阅失败: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "查找 RSS XML 数据中的 \"channel\" 元素失败." +msgstr "查找 RSS XML 数据中的 \"channel\" 元素失败。" #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "不支持的 RSS 版本." +msgstr "不支持的 RSS 版本。" #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "查找必需的 XML 数据中的 RSS \"item\" 元素失败." +msgstr "查找必需的 XML 数据中的 RSS \"item\" 元素失败。" #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "查找必需的 XML 数据中的 RSS \"channel\" 元素失败." +msgstr "查找必需的 XML 数据中的 RSS \"channel\" 元素失败。" -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:124 +msgid "Error" +msgstr "错误" + +#: ../extensions/feed-panel/main.c:126 #, c-format msgid "Feed '%s' already exists" -msgstr "已订阅过 '%s' " +msgstr "订阅 '%s' 已经存在" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:203 #, c-format msgid "Error loading feed '%s'" -msgstr "加载订阅 %s 出错" - -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "新建订阅" +msgstr "加载订阅 '%s' 出错" -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:514 msgid "Feed Panel" msgstr "订阅面板" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:515 msgid "Read Atom/ RSS feeds" -msgstr "阅读 Atom/ RSS 订阅" +msgstr "阅读 Atom 及 RSS 订阅" #: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" @@ -2161,8 +2122,7 @@ msgid "Control Midori by moving the mouse" msgstr "用鼠标移动控制 Midori" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "常驻页面" @@ -2176,7 +2136,7 @@ msgstr "定制快捷键" #: ../extensions/shortcuts.c:264 msgid "Customize Sh_ortcuts..." -msgstr "定制快捷键(_o)" +msgstr "定制快捷键(_O)..." #: ../extensions/shortcuts.c:303 msgid "Shortcuts" @@ -2200,28 +2160,30 @@ msgstr "状态栏特性" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "方便的开关网页中的特性" +msgstr "方便地打开/关闭网页中的特性" -#: ../extensions/tab-panel.c:371 -#: ../extensions/tab-panel.c:431 +#: ../extensions/tab-panel.c:558 ../extensions/tab-panel.c:613 msgid "Tab Panel" -msgstr "标签页面板" +msgstr "标签面板" -#: ../extensions/tab-panel.c:415 +#: ../extensions/tab-panel.c:597 msgid "T_ab Panel" -msgstr "标签页面板(_a)" +msgstr "标签面板(_A)" -#: ../extensions/tab-panel.c:432 +#: ../extensions/tab-panel.c:614 msgid "Show tabs in a vertical panel" -msgstr "在垂直面板里显示标签页" +msgstr "在垂直面板里显示标签" #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "定制工具栏" #: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "选择在工具栏上显示的项目, 可以拖动各项调整显示顺序." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"选择在工具栏上显示的项目，可以拖动各项调整显示顺序。" #: ../extensions/toolbar-editor.c:423 msgid "Available Items" @@ -2243,3 +2205,109 @@ msgstr "工具栏编辑器" msgid "Easily edit the toolbar layout" msgstr "轻松编辑工具栏布局" +#~ msgid "Add Shortcut to the _desktop" +#~ msgstr "添加快捷方式到桌面(_d)" + +#~ msgid "Add shortcut to the desktop" +#~ msgstr "添加快捷方式到桌面" + +#~ msgid "Subscribe to News _feed" +#~ msgstr "添加到新闻订阅(_f)" + +#~ msgid "Subscribe to this news feed" +#~ msgstr "添加到此新闻订阅" + +#~ msgid "Undo the last modification" +#~ msgstr "撤销上个改动" + +#~ msgid "Redo the last modification" +#~ msgstr "重复上个修改" + +#~ msgid "Focus _Current Tab" +#~ msgstr "聚焦到当前标签页(_C)" + +#~ msgid "Focus the current tab" +#~ msgstr "聚焦到当前标签页" + +#~ msgid "Open last _session" +#~ msgstr "打开上次会话(_s)" + +#~ msgid "Open the tabs saved in the last session" +#~ msgstr "打开上次运行时的标签页(_s)" + +#~ msgid "iPhone" +#~ msgstr "iPhone" + +#~ msgid "Kinetic scrolling" +#~ msgstr "平滑滚动" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "是否根据拖拽速度惯性滚动页面" + +#~ msgid "Send a message to %s" +#~ msgstr "发送消息到 %s" + +#~ msgid "_Copy Link destination" +#~ msgstr "复制链接目标(_C)" + +#~ msgid "Open _Image in New Tab" +#~ msgstr "在新标签页中打开图像(_I)" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "在新窗口中打开图像(_n)" + +#~ msgid "Copy Image _Address" +#~ msgstr "复制图像地址(_A)" + +#~ msgid "Save I_mage" +#~ msgstr "保存图像文件(_m)" + +#~ msgid "Download I_mage" +#~ msgstr "下载图像(_m)" + +#~ msgid "Copy Video _Address" +#~ msgstr "复制视频地址(_A)" + +#~ msgid "Save _Video" +#~ msgstr "保存视频文件(_V)" + +#~ msgid "Download _Video" +#~ msgstr "下载视频文件(_V)" + +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "复制用户脚本到 %s 目录，用户样式到 %s 目录。" + +#~ msgid "Can't monitor folder '%s': %s" +#~ msgstr "无法监视 “%s” 目录：%s" + +#~ msgid "_Remember password" +#~ msgstr "保存密码(_R)" + +#~ msgid "" +#~ "Type the address of a preconfigured filter list in the text entry and " +#~ "click \"Add\" to add it to the list. You can find more lists at %s." +#~ msgstr "" +#~ "在文本输入框中输入预设过滤器列表的地址，然后点击“添加”加入此列表。您可以" +#~ "在 %s 找到更多列表。" + +#~ msgid "DNS prefetching" +#~ msgstr "DNS 预获取" + +#~ msgid "Prefetch IP addresses of hovered links" +#~ msgstr "当鼠标停留在链接上时预先获取 IP 地址" + +#~ msgid "Stores history of entered form data" +#~ msgstr "保存表格输入历史" + +#~ msgid "Not available: %s" +#~ msgstr "%s 不可用" + +#~ msgid "Resource files not installed" +#~ msgstr "资源文件没有安装" + +#~ msgid "Form history filler" +#~ msgstr "表格历史过滤器" + +#~ msgid "Not available on this platform" +#~ msgstr "在此平台上不可用" diff --git a/tests/properties.c b/tests/properties.c index 6d9ecffb..239717ca 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -78,6 +78,9 @@ properties_object_get_set (GObject* object) g_param_spec_get_name (pspec), g_param_spec_get_name (pspecs[j])); + if (!(pspec->flags & G_PARAM_READABLE)) + continue; + g_object_get (object, property, &value, NULL); if (type == G_TYPE_PARAM_BOOLEAN) { diff --git a/wscript b/wscript index 9f345ae6..b0e71274 100644 --- a/wscript +++ b/wscript @@ -25,7 +25,7 @@ import misc major = 0 minor = 2 -micro = 0 +micro = 2 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) @@ -56,12 +56,12 @@ def is_mingw (env): return False # Compile Win32 res files to (resource) object files -@extension ('.rc') def rc_file(self, node): rctask = self.create_task ('winrc') rctask.set_inputs (node) rctask.set_outputs (node.change_ext ('.rc.o')) self.compiled_tasks.append (rctask) +rc_file = extension ('.rc')(rc_file) Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE', before='cc cxx', shell=False) @@ -190,6 +190,15 @@ def configure (conf): sqlite = 'no ' conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) + if option_enabled ('libnotify'): + check_pkg ('libnotify', mandatory=False) + libnotify = ['N/A','yes'][conf.env['HAVE_LIBNOTIFY'] == 1] + if libnotify != 'yes': + option_checkfatal ('libnotify', 'notifications') + else: + libnotify = 'no ' + conf.define ('HAVE_LIBNOTIFY', [0,1][libnotify == 'yes']) + conf.check (lib='m', mandatory=True) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) @@ -197,6 +206,8 @@ def configure (conf): args = '' if Options.platform == 'win32': args = '--define-variable=target=win32' + elif sys.platform != 'darwin': + check_pkg ('x11') check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) check_pkg ('webkit-1.0', '1.1.1', args=args) check_pkg ('libsoup-2.4', '2.25.2') @@ -220,6 +231,8 @@ def configure (conf): if option_enabled ('hildon'): if check_pkg ('hildon-1', mandatory=False, var='HILDON'): check_pkg ('libosso', var='HILDON') + check_pkg ('hildon-1', '2.2', var='HILDON_2_2') + check_pkg ('hildon-fm-2', var='HILDON_FM') hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] if hildon != 'yes': option_checkfatal ('hildon', 'Maemo integration') @@ -246,6 +259,8 @@ def configure (conf): conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) if Options.platform == 'win32': conf.env.append_value ('LINKFLAGS', '-mwindows') + else: + conf.check (header_name='signal.h') conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) @@ -290,6 +305,7 @@ def configure (conf): Localization: %(nls)s (intltool) Icon optimizations: %(icons)s (rsvg-convert) Persistent history: %(sqlite)s (sqlite3) + Notifications: %(libnotify)s (libnotify) IDN support: %(idn)s (libidn or libsoup 2.27.90) User documentation: %(user_docs)s (docutils) @@ -300,7 +316,7 @@ def configure (conf): Utils.pprint ('RED', 'Please use an older or newer version.') def set_options (opt): - def is_maemo (): return os.path.exists ('/etc/osso-af-init/osso-gtk.defs') + def is_maemo (): return os.path.exists ('/etc/osso-af-init/') def add_enable_option (option, desc, group=None, disable=False): if group == None: @@ -338,9 +354,14 @@ def set_options (opt): add_enable_option ('unique', 'single instance support', group) add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('sqlite', 'history database support', group) + add_enable_option ('libnotify', 'notification support', group) add_enable_option ('addons', 'building of extensions', group) add_enable_option ('hildon', 'Maemo integration', group, disable=not is_maemo ()) + # Provided for compatibility + opt.add_option ('--build', help='Ignored') + opt.add_option ('--disable-maintainer-mode', help='Ignored') + def build (bld): def image_to_win32ico (task): 'Converts an image to a Win32 ico' @@ -378,7 +399,7 @@ def build (bld): if bld.env['docs']: bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ - 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') + 'AUTHORS COPYING ChangeLog EXPAT README') # Install default configuration bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search') @@ -449,22 +470,25 @@ def build (bld): bld.install_files ('${MDATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png') else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/error.html') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial.json') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js') - bld.install_files ('${MDATADIR}/' + APPNAME, 'data/autosuggestcontrol.js') - bld.install_files ('${MDATADIR}/' + APPNAME, 'data/autosuggestcontrol.css') - - # FIXME: Determine the library naming for other platforms - if Options.platform == 'linux': - extensions = os.listdir ('data/extensions') - for extension in extensions: - folder = 'lib' + extension + '.so' - source = 'data/extensions/' + extension + '/config' - if os.path.exists (source): - bld.install_files ('${SYSCONFDIR}/' + APPNAME + \ - '/extensions/' + folder, source) + + if bld.env['addons']: + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css') + + # FIXME: Determine the library naming for other platforms + if Options.platform == 'linux': + extensions = os.listdir ('data/extensions') + for extension in extensions: + folder = 'lib' + extension + '.so' + source = 'data/extensions/' + extension + '/config' + if os.path.exists (source): + bld.install_files ('${SYSCONFDIR}/' + APPNAME + \ + '/extensions/' + folder, source) if Options.commands['check']: bld.add_subdirs ('tests')